diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:52:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:52:36 +1000 |
| commit | 739233d541de91f9ef64d48dd1b573ccbb8aa3c2 (patch) | |
| tree | a852315b2aa98035acfaf624801d4edf00cf3f3e /drivers/staging/vt6655/device_main.c | |
| parent | b235f554105c08a1b61b4cc539a3a1d41451dfad (diff) | |
| parent | 9b9913d80b2896ecd9e0a1a8f167ccad66fac79c (diff) | |
Merge remote branch 'staging-next/staging-next'
Diffstat (limited to 'drivers/staging/vt6655/device_main.c')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 4d6b66a4fd9d..f5028d9d7d9b 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/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 |