From: ciminaghi@gnudd.com
To: sameo@linux.intel.com, rubini@gnudd.com,
giancarlo.asnaghi@st.com, broonie@opensource.wolfsonmicro.com
Cc: linux-kernel@vger.kernel.org, Davide Ciminaghi <ciminaghi@gnudd.com>
Subject: [PATCH 05/10] drivers/mfd/sta2x11-mfd: only add sta2x11_mfd if it hasn't already been added
Date: Fri, 9 Nov 2012 15:19:56 +0100 [thread overview]
Message-ID: <1352470801-2418-6-git-send-email-ciminaghi@gnudd.com> (raw)
In-Reply-To: <1352470801-2418-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 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mfd/sta2x11-mfd.c b/drivers/mfd/sta2x11-mfd.c
index 8d38ef2..b981dc4 100644
--- a/drivers/mfd/sta2x11-mfd.c
+++ b/drivers/mfd/sta2x11-mfd.c
@@ -585,7 +585,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.10.4
next prev parent reply other threads:[~2012-11-09 14:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-09 14:19 [PATCH v3 00/10] sta2x11-mfd patches ciminaghi
2012-11-09 14:19 ` [PATCH 01/10] drivers/mfd/sta2x11-mfd: add apb-soc regs driver and factor out common code ciminaghi
2012-11-09 14:19 ` [PATCH 02/10] drivers/mfd/sta2x11-mfd: add regmap support ciminaghi
2012-11-09 14:19 ` [PATCH 03/10] drivers/mfd/sta2x11-mfd: add sta2x11_mfd_get_regs_data() function ciminaghi
2012-11-09 14:19 ` [PATCH 04/10] drivers/mfd/sta2x11-mfd: use defines for platform devices' names ciminaghi
2012-11-09 14:19 ` ciminaghi [this message]
2012-11-09 14:19 ` [PATCH 06/10] drivers/mfd/sta2x11-mfd: platform probe: don't mind about gpio platform data ciminaghi
2012-11-09 14:19 ` [PATCH 07/10] drivers/mfd/sta2x11-mfd: use one lock per device instead of one lock per mfd ciminaghi
2012-11-09 14:19 ` [PATCH 08/10] drivers/mfd/sta2x11-mfd: add scr (otp registers) platform driver ciminaghi
2012-11-09 14:20 ` [PATCH 09/10] drivers/mfd/sta2x11-mfd: add defines for some sta2x11 sctl registers ciminaghi
2012-11-09 14:20 ` [PATCH 10/10] drivers/mfd/sta2x11-mfd: add myself to copyright ciminaghi
2012-11-19 17:58 ` [PATCH v3 00/10] sta2x11-mfd patches Samuel Ortiz
2012-11-19 18:44 ` Samuel Ortiz
2012-11-20 0:19 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2012-10-22 14:50 [PATCH v2 " ciminaghi
2012-10-22 14:50 ` [PATCH 05/10] drivers/mfd/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=1352470801-2418-6-git-send-email-ciminaghi@gnudd.com \
--to=ciminaghi@gnudd.com \
--cc=broonie@opensource.wolfsonmicro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.