diff --git a/[refs] b/[refs] index ec8204e09621..ecd4656c23d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd2bc4c763db8a9c6eeef0d2cf6f384514b6cb6c +refs/heads/master: 13b631a599cddabc1cbb3a2fb862aee5ceb6e427 diff --git a/trunk/drivers/staging/vt6655/device_main.c b/trunk/drivers/staging/vt6655/device_main.c index 4d6b66a4fd9d..f5028d9d7d9b 100644 --- a/trunk/drivers/staging/vt6655/device_main.c +++ b/trunk/drivers/staging/vt6655/device_main.c @@ -955,12 +955,13 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) pDevice->dev = dev; pDevice->next_module = root_device_dev; root_device_dev = dev; - dev->irq = pcid->irq; if (pci_enable_device(pcid)) { device_free_info(pDevice); return -ENODEV; } + dev->irq = pcid->irq; + #ifdef DEBUG printk("Before get pci_info memaddr is %x\n",pDevice->memaddr); #endif