]> git.karo-electronics.de Git - karo-tx-linux.git/commit
mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
authorChris Ball <cjb@laptop.org>
Tue, 29 Mar 2011 04:46:12 +0000 (00:46 -0400)
committerAndi Kleen <ak@linux.intel.com>
Mon, 1 Aug 2011 20:54:43 +0000 (13:54 -0700)
commit725296955c01285787cdfbaf813298626c9c09ee
tree5eae93a7d2f575efb1928be6748a7e4d353d5c98
parent4f1ca069a7660ba29ca9bcc126539982a804b38f
mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()

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