Commit 225d85fe authored Oct 04, 2010 by Alan Cox Committed by Chris Ball Oct 23, 2010

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>

parent ed2a9785

drivers/mmc/host/sdhci-pci.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)) {

Admin message