Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / rtl8187se / r8180_core.c

diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index ed7457bc24eafdc9978037800054d335a15a22e9..70ab0084e5f58ff61b82baf54b6fca561e3b6db8 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -3547,6 +3547,7 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev,
        struct net_device *dev = NULL;
        struct r8180_priv *priv = NULL;
        u8 unit = 0;
+       int ret = -ENODEV;
 
        unsigned long pmem_start, pmem_len, pmem_flags;
 
@@ -3561,8 +3562,10 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev,
        pci_set_dma_mask(pdev, 0xffffff00ULL);
        pci_set_consistent_dma_mask(pdev, 0xffffff00ULL);
        dev = alloc_ieee80211(sizeof(struct r8180_priv));
-       if (!dev)
-               return -ENOMEM;
+       if (!dev) {
+               ret = -ENOMEM;
+               goto fail_free;
+       }
        priv = ieee80211_priv(dev);
        priv->ieee80211 = netdev_priv(dev);
 
@@ -3641,11 +3644,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;
 }
 
 static void __devexit rtl8180_pci_remove(struct pci_dev *pdev)