]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: rtl8187e: call disable_pci_device() if pci_probe() failed
authorKulikov Vasiliy <segooon@gmail.com>
Mon, 9 Aug 2010 19:51:59 +0000 (23:51 +0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 31 Aug 2010 21:48:09 +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/rtl8192e/r8192E_core.c

index 17a806f9ee7762de84a2588d2c2b3de7b3f9fe68..2334ccd5fc22f6f57fba1906fd1b11a58d7a30fe 100644 (file)
@@ -6325,6 +6325,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
        struct net_device *dev = NULL;
        struct r8192_priv *priv= NULL;
        u8 unit = 0;
+       int ret = -ENODEV;
 
 #ifdef CONFIG_RTL8192_IO_MAP
        unsigned long pio_start, pio_len, pio_flags;
@@ -6344,8 +6345,10 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
        pci_set_dma_mask(pdev, 0xffffff00ULL);
        pci_set_consistent_dma_mask(pdev,0xffffff00ULL);
        dev = alloc_ieee80211(sizeof(struct r8192_priv));
-       if (!dev)
-               return -ENOMEM;
+       if (!dev) {
+               ret = -ENOMEM;
+               goto fail_free;
+       }
 
        pci_set_drvdata(pdev, dev);
        SET_NETDEV_DEV(dev, &pdev->dev);
@@ -6494,11 +6497,12 @@ fail:
                free_ieee80211(dev);
        }
 
+fail_free:
        pci_disable_device(pdev);
 
        DMESG("wlan driver load failed\n");
        pci_set_drvdata(pdev, NULL);
-       return -ENODEV;
+       return ret;
 
 }