From: Kulikov Vasiliy Date: Mon, 9 Aug 2010 19:51:52 +0000 (+0400) Subject: staging: rtl8187se: call disable_pci_device() if pci_probe() failed X-Git-Tag: v2.6.37-rc1~60^2~3^2~772 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=beef9697244991c43673716447edd8a12b177b36;p=karo-tx-linux.git staging: rtl8187se: call disable_pci_device() if pci_probe() failed Driver should call disable_pci_device() if it returns from pci_probe() with error. Signed-off-by: Kulikov Vasiliy Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index ed7457bc24ea..70ab0084e5f5 100644 --- 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)