From 2cfcf98ac225a7dac6c6e6428dd140683fc993d0 Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Mon, 9 Aug 2010 23:51:52 +0400 Subject: [PATCH] --- yaml --- r: 219675 b: refs/heads/master c: beef9697244991c43673716447edd8a12b177b36 h: refs/heads/master i: 219673: da29974773fae12ad71060630b97645142e15e0c 219671: ec85eacf72dd41fc5a1169d6ac490810c735d1f0 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8187se/r8180_core.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d7b5e613bdc2..80f2bcd4b3bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 036b00e0917a867a018c583aa86aa66affb9321c +refs/heads/master: beef9697244991c43673716447edd8a12b177b36 diff --git a/trunk/drivers/staging/rtl8187se/r8180_core.c b/trunk/drivers/staging/rtl8187se/r8180_core.c index ed7457bc24ea..70ab0084e5f5 100644 --- a/trunk/drivers/staging/rtl8187se/r8180_core.c +++ b/trunk/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 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, 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)