]> 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)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 9 May 2011 22:54:56 +0000 (15:54 -0700)
commitd98a8df82645f3c5ee883118591ad385991740bd
tree04486de636cc46466af52387ee43195ac2fc6db7
parent0ccd644ce6a803b4f7ae5b3b4da614b8a51037cc
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>
drivers/mmc/host/sdhci-pci.c