aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-10-04 15:24:21 +0100
committerChris Ball <cjb@laptop.org>2010-10-23 21:11:19 +0800
commit225d85fe7ddca2985548d98e410f7baf4a5d6260 (patch)
treec1426fab1b226f061e0d721e3370636fa76c8d0b /drivers/mmc
parented2a9785942b0986ac858f3f48d7fc5f7c7183de (diff)
downloadkernel_samsung_smdk4412-225d85fe7ddca2985548d98e410f7baf4a5d6260.zip
kernel_samsung_smdk4412-225d85fe7ddca2985548d98e410f7baf4a5d6260.tar.gz
kernel_samsung_smdk4412-225d85fe7ddca2985548d98e410f7baf4a5d6260.tar.bz2
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')
-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 e8aa99d..4f5d6d0 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)) {