summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci-pci.c
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2011-03-29 00:46:12 -0400
committerChris Ball <cjb@laptop.org>2011-04-27 19:14:55 -0400
commit9fdcdbb0d84922e7ccda2f717a04ea62629f7e18 (patch)
treee19e33d135d5c7a53fbb99bf2f39e7456c503352 /drivers/mmc/host/sdhci-pci.c
parente8dad69408a9812d6bb42d03e74d2c314534a4fa (diff)
downloadop-kernel-dev-9fdcdbb0d84922e7ccda2f717a04ea62629f7e18.zip
op-kernel-dev-9fdcdbb0d84922e7ccda2f717a04ea62629f7e18.tar.gz
mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
If pci_ioremap_bar() fails during probe, we "goto release;" and free the host, but then we return 0 -- which tells sdhci_pci_probe() that the probe succeeded. Since we think the probe succeeded, when we unload sdhci we'll go to sdhci_pci_remove_slot() and it will try to dereference slot->host, which is now NULL because we freed it in the error path earlier. The patch simply sets ret appropriately, so that sdhci_pci_probe() will detect the failure immediately and bail out. Signed-off-by: Chris Ball <cjb@laptop.org> Cc: <stable@kernel.org>
Diffstat (limited to 'drivers/mmc/host/sdhci-pci.c')
-rw-r--r--drivers/mmc/host/sdhci-pci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index a136be7..f8b5f37 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -957,6 +957,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(
host->ioaddr = pci_ioremap_bar(pdev, bar);
if (!host->ioaddr) {
dev_err(&pdev->dev, "failed to remap registers\n");
+ ret = -ENOMEM;
goto release;
}
OpenPOWER on IntegriCloud