Skip to content

Commit

Permalink
staging: rtl8187e: call disable_pci_device() if pci_probe() failed
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kulikov Vasiliy authored and Greg Kroah-Hartman committed Aug 31, 2010
1 parent f090386 commit 3a8f2d3
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/staging/rtl8192e/r8192E_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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;

}

Expand Down

0 comments on commit 3a8f2d3

Please sign in to comment.