Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47cb905d authored by Kulikov Vasiliy's avatar Kulikov Vasiliy Committed by John W. Linville
Browse files

rt2x00: do not use PCI resources before pci_enable_device() 



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: default avatarKulikov Vasiliy <segooon@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 93c08c32

drivers/net/wireless/rt2x00/rt2x00pci.c

+10 −11
Original line number Diff line number Diff line
@@ -240,16 +240,16 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) 
	struct rt2x00_dev *rt2x00dev;

	int retval;



	retval = pci_request_regions(pci_dev, pci_name(pci_dev));

	retval = pci_enable_device(pci_dev);

	if (retval) {

		ERROR_PROBE("PCI request regions failed.\n");

		ERROR_PROBE("Enable device failed.\n");

		return retval;

	}



	retval = pci_enable_device(pci_dev);

	retval = pci_request_regions(pci_dev, pci_name(pci_dev));

	if (retval) {

		ERROR_PROBE("Enable device failed.\n");

		goto exit_release_regions;

		ERROR_PROBE("PCI request regions failed.\n");

		goto exit_disable_device;

	}



	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))) {

		ERROR_PROBE("PCI DMA not supported.\n");

		retval = -EIO;

		goto exit_disable_device;

		goto exit_release_regions;

	}



	hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);

	if (!hw) {

		ERROR_PROBE("Failed to allocate hardware.\n");

		retval = -ENOMEM;

		goto exit_disable_device;

		goto exit_release_regions;

	}



	pci_set_drvdata(pci_dev, hw);
@@ -300,13 +300,12 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) 
exit_free_device:

	ieee80211_free_hw(hw);



exit_disable_device:

	if (retval != -EBUSY)

		pci_disable_device(pci_dev);



exit_release_regions:

	pci_release_regions(pci_dev);



exit_disable_device:

	pci_disable_device(pci_dev);



	pci_set_drvdata(pci_dev, NULL);



	return retval;