diff options
Diffstat (limited to 'drivers/ide/ide-scan-pci.c')
| -rw-r--r-- | drivers/ide/ide-scan-pci.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/ide/ide-scan-pci.c b/drivers/ide/ide-scan-pci.c index 86aa88aeb3a6..acf874800ca4 100644 --- a/drivers/ide/ide-scan-pci.c +++ b/drivers/ide/ide-scan-pci.c | |||
| @@ -56,6 +56,7 @@ static int __init ide_scan_pcidev(struct pci_dev *dev) | |||
| 56 | { | 56 | { |
| 57 | struct list_head *l; | 57 | struct list_head *l; |
| 58 | struct pci_driver *d; | 58 | struct pci_driver *d; |
| 59 | int ret; | ||
| 59 | 60 | ||
| 60 | list_for_each(l, &ide_pci_drivers) { | 61 | list_for_each(l, &ide_pci_drivers) { |
| 61 | d = list_entry(l, struct pci_driver, node); | 62 | d = list_entry(l, struct pci_driver, node); |
| @@ -63,10 +64,14 @@ static int __init ide_scan_pcidev(struct pci_dev *dev) | |||
| 63 | const struct pci_device_id *id = | 64 | const struct pci_device_id *id = |
| 64 | pci_match_id(d->id_table, dev); | 65 | pci_match_id(d->id_table, dev); |
| 65 | 66 | ||
| 66 | if (id != NULL && d->probe(dev, id) >= 0) { | 67 | if (id != NULL) { |
| 67 | dev->driver = d; | 68 | pci_assign_irq(dev); |
| 68 | pci_dev_get(dev); | 69 | ret = d->probe(dev, id); |
| 69 | return 1; | 70 | if (ret >= 0) { |
| 71 | dev->driver = d; | ||
| 72 | pci_dev_get(dev); | ||
| 73 | return 1; | ||
| 74 | } | ||
| 70 | } | 75 | } |
| 71 | } | 76 | } |
| 72 | } | 77 | } |