staging: spectra: call disable_pci_device() if pci_probe() failed
authorKulikov Vasiliy <segooon@gmail.com>
Mon, 9 Aug 2010 19:52:06 +0000 (23:52 +0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 31 Aug 2010 21:48:08 +0000 (14:48 -0700)
Driver should call disable_pci_device() if it returns from pci_probe()
with error.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/spectra/lld_nand.c

index 13c3ad2db3942e74369538884c29819ffe9fd4dd..0d647a8fd2b6a6fa2283976dc7d57a51367f526c 100644 (file)
@@ -2411,13 +2411,15 @@ static int nand_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        csr_base = pci_resource_start(dev, 0);
        if (!csr_base) {
                printk(KERN_ERR "Spectra: pci_resource_start failed!\n");
-               return -ENODEV;
+               ret = -ENODEV;
+               goto failed_req_csr;
        }
 
        csr_len = pci_resource_len(dev, 0);
        if (!csr_len) {
                printk(KERN_ERR "Spectra: pci_resource_len failed!\n");
-               return -ENODEV;
+               ret = -ENODEV;
+               goto failed_req_csr;
        }
 
        ret = pci_request_regions(dev, SPECTRA_NAND_NAME);
@@ -2464,6 +2466,7 @@ static int nand_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 failed_remap_csr:
        pci_release_regions(dev);
 failed_req_csr:
+       pci_disable_device(dev);
 
        return ret;
 }