Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 15:40:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rt2x00: do not use PCI resources before pci_enable_device()

Browse Source 
IRQ and resource[] may not have correct values until
after PCI hotplug setup occurs at pci_enable_device() time.

The semantic match that finds this problem is as follows:

// <smpl>
@@
identifier x;
identifier request ~= "pci_request.*|pci_resource.*";
@@

(
* x->irq
|
* x->resource
|
* request(x, ...)
)
 ...
*pci_enable_device(x)
// </smpl>

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Kulikov Vasiliy 2010-08-03 19:43:22 +04:00 committed by John W. Linville
parent 93c08c3291
commit 47cb905d6b
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/wireless/rt2x00/rt2x00pci.c
View File

@ -240,16 +240,16 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
struct rt2x00_dev *rt2x00dev; struct rt2x00_dev *rt2x00dev;
int retval; int retval;
retval = pci_request_regions(pci_dev, pci_name(pci_dev));
if (retval) {
ERROR_PROBE("PCI request regions failed.\n");
return retval;
}
retval = pci_enable_device(pci_dev); retval = pci_enable_device(pci_dev);
if (retval) { if (retval) {
ERROR_PROBE("Enable device failed.\n"); ERROR_PROBE("Enable device failed.\n");
goto exit_release_regions; return retval;
}
retval = pci_request_regions(pci_dev, pci_name(pci_dev));
if (retval) {
ERROR_PROBE("PCI request regions failed.\n");
goto exit_disable_device;
} }
pci_set_master(pci_dev); pci_set_master(pci_dev);
@ -260,14 +260,14 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) { if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) {
ERROR_PROBE("PCI DMA not supported.\n"); ERROR_PROBE("PCI DMA not supported.\n");
retval = -EIO; retval = -EIO;
goto exit_disable_device; goto exit_release_regions;
} }
hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw); hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);
if (!hw) { if (!hw) {
ERROR_PROBE("Failed to allocate hardware.\n"); ERROR_PROBE("Failed to allocate hardware.\n");
retval = -ENOMEM; retval = -ENOMEM;
goto exit_disable_device; goto exit_release_regions;
} }
pci_set_drvdata(pci_dev, hw); pci_set_drvdata(pci_dev, hw);
@ -300,13 +300,12 @@ exit_free_reg:
exit_free_device: exit_free_device:
ieee80211_free_hw(hw); ieee80211_free_hw(hw);
exit_disable_device:
if (retval != -EBUSY)
pci_disable_device(pci_dev);
exit_release_regions: exit_release_regions:
pci_release_regions(pci_dev); pci_release_regions(pci_dev);
exit_disable_device:
pci_disable_device(pci_dev);
pci_set_drvdata(pci_dev, NULL); pci_set_drvdata(pci_dev, NULL);
return retval; return retval;