]> git.kernelconcepts.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)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Wed, 14 Mar 2012 14:57:29 +0000 (10:57 -0400)
commit11bc82bde3a5f59a07a8c2f6e4d0aab16dacd06b
treec6099eb90e5fa1a0d580328035b2a6c0b6941bc6
parent55509a89cfb19db26fbfa8fa68c0daadfa08fd7b
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: Paul Gortmaker <paul.gortmaker@windriver.com>
drivers/mmc/host/sdhci-pci.c