From c8c3e17c2df9940a6c149360c3087859aab376e5 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Fri, 28 Oct 2011 16:27:07 -0600 Subject: [PATCH] --- yaml --- r: 283373 b: refs/heads/master c: c4e06576282c5f91549b344fd0f516c421332b68 h: refs/heads/master i: 283371: 9762f461192667f6225cf03f20a2cffc5dd05e90 v: v3 --- [refs] | 2 +- trunk/drivers/parisc/dino.c | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index fa96d04bc721..3171def002f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a4580011da2a2a1a5a152e13dce2a32997d3ee9 +refs/heads/master: c4e06576282c5f91549b344fd0f516c421332b68 diff --git a/trunk/drivers/parisc/dino.c b/trunk/drivers/parisc/dino.c index bcd5d54b7d4d..90252c016a08 100644 --- a/trunk/drivers/parisc/dino.c +++ b/trunk/drivers/parisc/dino.c @@ -1007,22 +1007,24 @@ static int __init dino_probe(struct parisc_device *dev) ** It's not used to avoid chicken/egg problems ** with configuration accessor functions. */ - dino_dev->hba.hba_bus = bus = pci_scan_bus_parented(&dev->dev, + dino_dev->hba.hba_bus = bus = pci_create_bus(&dev->dev, dino_current_bus, &dino_cfg_ops, NULL); - - if(bus) { - /* This code *depends* on scanning being single threaded - * if it isn't, this global bus number count will fail - */ - dino_current_bus = bus->subordinate + 1; - pci_bus_assign_resources(bus); - pci_bus_add_devices(bus); - } else { + if (!bus) { printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n", dev_name(&dev->dev), dino_current_bus); /* increment the bus number in case of duplicates */ dino_current_bus++; + return 0; } + + bus->subordinate = pci_scan_child_bus(bus); + + /* This code *depends* on scanning being single threaded + * if it isn't, this global bus number count will fail + */ + dino_current_bus = bus->subordinate + 1; + pci_bus_assign_resources(bus); + pci_bus_add_devices(bus); return 0; }