Commit 225d85fe authored by Alan Cox's avatar Alan Cox Committed by Chris Ball

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: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent ed2a9785
...@@ -818,6 +818,8 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev, ...@@ -818,6 +818,8 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
goto free; goto free;
} }
slots = chip->num_slots; /* Quirk may have changed this */
for (i = 0;i < slots;i++) { for (i = 0;i < slots;i++) {
slot = sdhci_pci_probe_slot(pdev, chip, first_bar + i); slot = sdhci_pci_probe_slot(pdev, chip, first_bar + i);
if (IS_ERR(slot)) { if (IS_ERR(slot)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment