From: ciminaghi@gnudd.com
To: sameo@linux.intel.com, rubini@gnudd.com, giancarlo.asnaghi@st.com
Cc: linux-kernel@vger.kernel.org, Davide Ciminaghi <ciminaghi@gnudd.com>
Subject: [PATCH 4/8] sta2x11-mfd : only add sta2x11_mfd if it hasn't already been added
Date: Wed, 12 Sep 2012 12:11:15 +0200 [thread overview]
Message-ID: <1347444680-31479-5-git-send-email-ciminaghi@gnudd.com> (raw)
In-Reply-To: <1347444680-31479-1-git-send-email-ciminaghi@gnudd.com>
From: Davide Ciminaghi <ciminaghi@gnudd.com>
The pci probe method is called twice now, so we have to call
sta2x11_mfd_add() only once to avoid a -EBUSY error.
Signed-off-by: Davide Ciminaghi <ciminaghi@gnudd.com>
---
drivers/mfd/sta2x11-mfd.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/sta2x11-mfd.c b/drivers/mfd/sta2x11-mfd.c
index a9eeba1..82fe356 100644
--- a/drivers/mfd/sta2x11-mfd.c
+++ b/drivers/mfd/sta2x11-mfd.c
@@ -561,7 +561,8 @@ static int __devinit sta2x11_mfd_probe(struct pci_dev *pdev,
sta2x11_mfd_setup(pdev, setup_data);
/* Record this pdev before mfd_add_devices: their probe looks for it */
- sta2x11_mfd_add(pdev, GFP_ATOMIC);
+ if (!sta2x11_mfd_find(pdev))
+ sta2x11_mfd_add(pdev, GFP_ATOMIC);
/* Just 2 bars for all mfd's at present */
for (i = 0; i < 2; i++) {
--
1.7.9.1
next prev parent reply other threads:[~2012-09-12 10:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-12 10:11 [PATCH 0/8 RESEND] sta2x11-mfd patches ciminaghi
2012-09-12 10:11 ` [PATCH 1/8] sta2x11-mfd : add apb-soc regs driver and factor out common code ciminaghi
2012-09-12 10:11 ` [PATCH 2/8] sta2x11-mfd : add sta2x11_mfd_get_regs_data() function ciminaghi
2012-09-12 10:11 ` [PATCH 3/8] sta2x11-mfd : use defines for platform devices' names ciminaghi
2012-09-12 10:11 ` ciminaghi [this message]
2012-09-12 10:11 ` [PATCH 5/8] sta2x11-mfd : platform probe: don't mind about gpio platform data ciminaghi
2012-09-12 10:11 ` [PATCH 6/8] sta2x11-mfd : use one lock per device instead of one lock per mfd ciminaghi
2012-09-12 10:11 ` [PATCH 7/8] sta2x11-mfd : add defines for sctl registers ciminaghi
2012-09-12 10:11 ` [PATCH 7/8] sta2x11-mfd : add defines for some sta2x11 " ciminaghi
2012-09-12 10:11 ` [PATCH 8/8] sta2x11-mfd : add myself to copyright ciminaghi
2012-09-12 10:22 [PATCH 0/8 RESEND] sta2x11-mfd patches ciminaghi
2012-09-12 10:22 ` [PATCH 4/8] sta2x11-mfd : only add sta2x11_mfd if it hasn't already been added ciminaghi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347444680-31479-5-git-send-email-ciminaghi@gnudd.com \
--to=ciminaghi@gnudd.com \
--cc=giancarlo.asnaghi@st.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rubini@gnudd.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).