lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8187e: call disable_pci_device() if pci_probe() failed

Browse Source 
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>
This commit is contained in:
Kulikov Vasiliy
2010-08-09 23:51:59 +04:00
committed by Greg Kroah-Hartman
parent f090386309
commit 3a8f2d3c71
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/rtl8192e/r8192E_core.c
View File

@@ -6325,6 +6325,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
struct net_device *dev = NULL; struct net_device *dev = NULL;
struct r8192_priv *priv= NULL; struct r8192_priv *priv= NULL;
u8 unit = 0; u8 unit = 0;
int ret = -ENODEV;
#ifdef CONFIG_RTL8192_IO_MAP #ifdef CONFIG_RTL8192_IO_MAP
unsigned long pio_start, pio_len, pio_flags; 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_dma_mask(pdev, 0xffffff00ULL);
pci_set_consistent_dma_mask(pdev,0xffffff00ULL); pci_set_consistent_dma_mask(pdev,0xffffff00ULL);
dev = alloc_ieee80211(sizeof(struct r8192_priv)); dev = alloc_ieee80211(sizeof(struct r8192_priv));
if (!dev) if (!dev) {
return -ENOMEM; ret = -ENOMEM;
goto fail_free;
}
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
@@ -6494,11 +6497,12 @@ fail:
free_ieee80211(dev); free_ieee80211(dev);
} }
fail_free:
pci_disable_device(pdev); pci_disable_device(pdev);
DMESG("wlan driver load failed\n"); DMESG("wlan driver load failed\n");
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
return -ENODEV; return ret;
} }