Skip to content

Commit

Permalink
staging: rtl8187se: 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 036b00e commit beef969
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/staging/rtl8187se/r8180_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit beef969

Please sign in to comment.