Revert "powerpc/eeh: Fix crash when adding a device in a slot with DDW"

[pandora-kernel.git] / arch / powerpc / kernel / pci-common.c

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index a3cd949..458ed3b 100644 (file)
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1536,14 +1536,11 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus)
        pcibios_allocate_bus_resources(bus);
        pcibios_claim_one_bus(bus);
 
        pcibios_allocate_bus_resources(bus);
        pcibios_claim_one_bus(bus);
 

-       /* Fixup EEH */
-       eeh_add_device_tree_late(bus);
-

        /* Add new devices to global lists.  Register in proc, sysfs. */
        pci_bus_add_devices(bus);
 
        /* Add new devices to global lists.  Register in proc, sysfs. */
        pci_bus_add_devices(bus);
 

-       /* sysfs files should only be added after devices are added */
-       eeh_add_sysfs_files(bus);
+       /* Fixup EEH */
+       eeh_add_device_tree_late(bus);

 }
 EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);
 
 }
 EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);