Merge tag 'pci-v3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[pandora-kernel.git] / arch / ia64 / sn / kernel / io_init.c

diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 2b00ade..0b5ce82 100644 (file)
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -268,17 +268,10 @@ 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(res);
-       kfree(controller);
-       return;
+       if (bus == NULL) {
+               kfree(res);
+               kfree(controller);
+       }
 }
 
 /*