summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-10-04 16:24:21 +0200
committerChris Ball <cjb@laptop.org>2010-10-23 15:11:19 +0200
commit225d85fe7ddca2985548d98e410f7baf4a5d6260 (patch)
treec1426fab1b226f061e0d721e3370636fa76c8d0b /drivers/mmc/host
parentmmc: sdio: support suspend/resume while runtime suspended (diff)
downloadlinux-225d85fe7ddca2985548d98e410f7baf4a5d6260.tar.xz
linux-225d85fe7ddca2985548d98e410f7baf4a5d6260.zip
mmc: sdhci: Allow the probe handler to override slots
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> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host')
-rw-r--r--drivers/mmc/host/sdhci-pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index e8aa99deae9a..4f5d6d00d338 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -818,6 +818,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)) {