]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
via-velocity: do not use PCI resources before pci_enable_device()
authorKulikov Vasiliy <segooon@gmail.com>
Tue, 3 Aug 2010 05:43:18 +0000 (05:43 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Aug 2010 23:18:03 +0000 (16:18 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/via-velocity.c

index 42dffd3e5795b6737943170e0e6e4ccfe4043f62..fd69095ef6e33d61698556abac79a4e84429c8fe 100644 (file)
@@ -2763,12 +2763,12 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
 
        vptr->dev = dev;
 
-       dev->irq = pdev->irq;
-
        ret = pci_enable_device(pdev);
        if (ret < 0)
                goto err_free_dev;
 
+       dev->irq = pdev->irq;
+
        ret = velocity_get_pci_info(vptr, pdev);
        if (ret < 0) {
                /* error message already printed */