diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-14 17:47:46 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-14 17:47:46 -0600 |
| commit | df58f46c0f2a1d69268b734ac25c87ffb7aeb32a (patch) | |
| tree | 46540d251f4f1c1e44af8d5ce339b37e0045ffe0 /arch/ia64/sn/kernel/io_init.c | |
| parent | 726246d2e6d0ed53ac22b6fec50d1345f25e6730 (diff) | |
| parent | 050134864c1c76f49eb86c134a0e02fb3c196382 (diff) | |
| download | blackbird-op-linux-df58f46c0f2a1d69268b734ac25c87ffb7aeb32a.tar.gz blackbird-op-linux-df58f46c0f2a1d69268b734ac25c87ffb7aeb32a.zip | |
Merge branch 'pci/jiang-bus-lock-v3' into next
* pci/jiang-bus-lock-v3:
PCI: Return early on allocation failures to unindent mainline code
PCI: Simplify IOV implementation and fix reference count races
PCI: Drop redundant setting of bus->is_added in virtfn_add_bus()
unicore32/PCI: Remove redundant call of pci_bus_add_devices()
m68k/PCI: Remove redundant call of pci_bus_add_devices()
PCI: Rename pci_release_bus_bridge_dev() to pci_release_host_bridge_dev()
PCI: Fix refcount issue in pci_create_root_bus() error recovery path
ia64/PCI: Clean up pci_scan_root_bus() usage
PCI: Convert alloc_pci_dev(void) to pci_alloc_dev(bus)
PCI: Introduce pci_alloc_dev(struct pci_bus*) to replace alloc_pci_dev()
PCI: Introduce pci_bus_{get|put}() to manage PCI bus reference count
Conflicts:
drivers/pci/probe.c
Diffstat (limited to 'arch/ia64/sn/kernel/io_init.c')
| -rw-r--r-- | arch/ia64/sn/kernel/io_init.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index 238e2c511d94..e2c7733e18a7 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c @@ -326,16 +326,7 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller, &resources); if (bus == NULL) - goto error_return; /* error, or bus already scanned */ - - bus->sysdata = controller; - - return; - -error_return: - - kfree(controller); - return; + kfree(controller); } /* |
