summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorRahul Ruikar <rahul.ruikar@gmail.com>2010-09-26 17:00:29 +0530
committerDominik Brodowski <linux@dominikbrodowski.net>2010-09-26 15:54:25 +0200
commit40d24ff9b4309d37999bc0ae91a271f57651d9dd (patch)
tree07b3664ec20fa3fe20a518f0cb8a00de0dc781fb /drivers/pcmcia
parent7cdffc86528ec9c55c83c649b6d64cadeb558136 (diff)
downloadlinux-stable-40d24ff9b4309d37999bc0ae91a271f57651d9dd.tar.gz
linux-stable-40d24ff9b4309d37999bc0ae91a271f57651d9dd.tar.bz2
linux-stable-40d24ff9b4309d37999bc0ae91a271f57651d9dd.zip
pcmcia: pd6729: Fix error path
In error return path call pci_disable_device() which was enabled earlier. Signed-off-by: Rahul Ruikar <rahul.ruikar@gmail.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/pd6729.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index b8a869af0f44..deef6656ab7b 100644
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -646,7 +646,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev,
if (!pci_resource_start(dev, 0)) {
dev_warn(&dev->dev, "refusing to load the driver as the "
"io_base is NULL.\n");
- goto err_out_free_mem;
+ goto err_out_disable;
}
dev_info(&dev->dev, "Cirrus PD6729 PCI to PCMCIA Bridge at 0x%llx "