Prev: [PATCH 18/18] staging: spectra: call disable_pci_device() if pci_probe() failed
Next: [PATCH 05/18] char: synclink: call disable_pci_device() if pci_probe() failed
From: Kulikov Vasiliy on 6 Aug 2010 16:00
Driver should call disable_pci_device() if it returns from pci_probe()
with error. Also it must not be called if request_mem_region() fails as
it means that somebody uses device resources and rules the device.

Signed-off-by: Kulikov Vasiliy <segooon(a)gmail.com>
---
drivers/staging/rtl8187se/r8180_core.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index ed7457b..abd2d69 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -3547,6 +3547,8 @@ 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;
+ int pci_dev_busy = 0;

unsigned long pmem_start, pmem_len, pmem_flags;

@@ -3561,8 +3563,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);

@@ -3583,6 +3587,7 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev,

if (!request_mem_region(pmem_start, pmem_len, RTL8180_MODULE_NAME)) {
DMESG("request_mem_region failed!");
+ pci_dev_busy = 1;
goto fail;
}

@@ -3641,11 +3646,13 @@ fail:
free_ieee80211(dev);
}

- pci_disable_device(pdev);
+fail_free:
+ if (!pci_dev_busy)
+ 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)
--
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 18/18] staging: spectra: call disable_pci_device() if pci_probe() failed
Next: [PATCH 05/18] char: synclink: call disable_pci_device() if pci_probe() failed