From: Alan Cox <alan@linux.intel.com>
To: linux-mmc@vger.kernel.org, cjb@laptop.org
Subject: [PATCH 2/7] sdhci: Allow the probe handler to override slots
Date: Mon, 13 Sep 2010 18:39:02 +0100 [thread overview]
Message-ID: <20100913173856.20345.84969.stgit@localhost.localdomain> (raw)
In-Reply-To: <20100913172738.20345.61119.stgit@localhost.localdomain>
Currently we write it to the chip data, but if the probe handler overrides
it we ignore the new value and keep using our cached one. Fix this so that
a probe handler can adjust the slot count
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
drivers/mmc/host/sdhci-pci.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 3e29e94..9b0a348 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -870,6 +870,8 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
goto free;
}
+ slots = chip->num_slots; /* Quirk may have changed this */
+
for (i = 0;i < slots;i++) {
slot = sdhci_pci_probe_slot(pdev, chip, first_bar + i);
if (IS_ERR(slot)) {
next prev parent reply other threads:[~2010-09-13 18:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-13 17:38 [PATCH 0/7] Intel MID SDHCI support (take two) Alan Cox
2010-09-13 17:38 ` [PATCH 1/7] sdhci: Rework some of the quirk behaviour Alan Cox
2010-09-14 14:34 ` Wolfram Sang
2010-09-14 14:20 ` Alan Cox
2010-09-13 17:39 ` Alan Cox [this message]
2010-09-13 17:39 ` [PATCH 3/7] sdhci: Intel Medfield support Alan Cox
2010-09-13 17:39 ` [PATCH 4/7] mmc: serialization support Alan Cox
2010-09-13 17:39 ` [PATCH 5/7] sdhci: Tidy up spaces in sdhci_intel_mid Alan Cox
2010-09-14 14:21 ` Wolfram Sang
2010-09-14 13:40 ` Alan Cox
2010-09-14 14:45 ` Wolfram Sang
2010-09-14 14:21 ` Alan Cox
2010-09-14 16:57 ` Chris Ball
2010-09-14 16:41 ` Alan Cox
2010-09-14 20:00 ` Wolfram Sang
2010-09-13 17:39 ` [PATCH 6/7] sdhci_pci: Tidy this as well Alan Cox
2010-09-13 17:39 ` [PATCH 7/7] sdhci: Tidy up sdhci.c Alan Cox
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=20100913173856.20345.84969.stgit@localhost.localdomain \
--to=alan@linux.intel.com \
--cc=cjb@laptop.org \
--cc=linux-mmc@vger.kernel.org \
/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