From 3dfb2cdc353ae1cdc533452b0c7c1fde8271ecbb Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Mon, 9 Aug 2010 23:51:59 +0400 Subject: [PATCH] --- yaml --- r: 219681 b: refs/heads/master c: 3a8f2d3c716a218f1499041d74edb07638b45559 h: refs/heads/master i: 219679: 98a1931fe7770c1cde91687393902bc7b2f2ee35 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192e/r8192E_core.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5898ebf3b97b..1e740a349f09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0903863099668d6b03c7ea90b2e58a7ad1be6a3 +refs/heads/master: 3a8f2d3c716a218f1499041d74edb07638b45559 diff --git a/trunk/drivers/staging/rtl8192e/r8192E_core.c b/trunk/drivers/staging/rtl8192e/r8192E_core.c index 17a806f9ee77..2334ccd5fc22 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_core.c +++ b/trunk/drivers/staging/rtl8192e/r8192E_core.c @@ -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 @@ static int __devinit rtl8192_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; }