lkml.org 
[lkml]   [2011]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] [21/98] mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
Date
2.6.35-longterm review patch.  If anyone has any objections, please let me know.

------------------
From: Chris Ball <cjb@laptop.org>
commit 9fdcdbb0d84922e7ccda2f717a04ea62629f7e18 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>

---
drivers/mmc/host/sdhci-pci.c | 1 +
1 file changed, 1 insertion(+)
Index: linux-2.6.35.y/drivers/mmc/host/sdhci-pci.c
===================================================================
--- linux-2.6.35.y.orig/drivers/mmc/host/sdhci-pci.c
+++ linux-2.6.35.y/drivers/mmc/host/sdhci-pci.c
@@ -653,6 +653,7 @@ static struct sdhci_pci_slot * __devinit
host->ioaddr = pci_ioremap_bar(pdev, bar);
if (!host->ioaddr) {
dev_err(&pdev->dev, "failed to remap registers\n");
+ ret = -ENOMEM;
goto release;
}


\
 
 \ /
  Last update: 2011-07-27 02:41    [from the cache]
©2003-2011 Jasper Spaans