diff options
Diffstat (limited to 'drivers/parisc/lba_pci.c')
-rw-r--r-- | drivers/parisc/lba_pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index 59fbbf128365..f2661e1255af 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c | |||
@@ -1509,10 +1509,6 @@ lba_driver_probe(struct parisc_device *dev) | |||
1509 | lba_bus = lba_dev->hba.hba_bus = | 1509 | lba_bus = lba_dev->hba.hba_bus = |
1510 | pci_scan_bus_parented(&dev->dev, lba_dev->hba.bus_num.start, | 1510 | pci_scan_bus_parented(&dev->dev, lba_dev->hba.bus_num.start, |
1511 | cfg_ops, NULL); | 1511 | cfg_ops, NULL); |
1512 | if (lba_bus) { | ||
1513 | lba_next_bus = lba_bus->subordinate + 1; | ||
1514 | pci_bus_add_devices(lba_bus); | ||
1515 | } | ||
1516 | 1512 | ||
1517 | /* This is in lieu of calling pci_assign_unassigned_resources() */ | 1513 | /* This is in lieu of calling pci_assign_unassigned_resources() */ |
1518 | if (is_pdc_pat()) { | 1514 | if (is_pdc_pat()) { |
@@ -1533,7 +1529,6 @@ lba_driver_probe(struct parisc_device *dev) | |||
1533 | } | 1529 | } |
1534 | pci_enable_bridges(lba_bus); | 1530 | pci_enable_bridges(lba_bus); |
1535 | 1531 | ||
1536 | |||
1537 | /* | 1532 | /* |
1538 | ** Once PCI register ops has walked the bus, access to config | 1533 | ** Once PCI register ops has walked the bus, access to config |
1539 | ** space is restricted. Avoids master aborts on config cycles. | 1534 | ** space is restricted. Avoids master aborts on config cycles. |
@@ -1543,6 +1538,11 @@ lba_driver_probe(struct parisc_device *dev) | |||
1543 | lba_dev->flags |= LBA_FLAG_SKIP_PROBE; | 1538 | lba_dev->flags |= LBA_FLAG_SKIP_PROBE; |
1544 | } | 1539 | } |
1545 | 1540 | ||
1541 | if (lba_bus) { | ||
1542 | lba_next_bus = lba_bus->subordinate + 1; | ||
1543 | pci_bus_add_devices(lba_bus); | ||
1544 | } | ||
1545 | |||
1546 | /* Whew! Finally done! Tell services we got this one covered. */ | 1546 | /* Whew! Finally done! Tell services we got this one covered. */ |
1547 | return 0; | 1547 | return 0; |
1548 | } | 1548 | } |