Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

[deliverable/linux.git] / drivers / net / via-velocity.c

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 42dffd3e5795b6737943170e0e6e4ccfe4043f62..fd69095ef6e33d61698556abac79a4e84429c8fe 100644 (file)
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -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 */