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

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

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 7c37379ea9b1334446eda1d318fb0b46a210ac3e..fa12ae42d98c99f3c61b617f69d402a95cd6403c 100644 (file)
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1477,11 +1477,14 @@ void pcibios_finish_adding_to_bus(struct pci_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);
 
-       /* Fixup EEH */
-       eeh_add_device_tree_late(bus);
+       /* sysfs files should only be added after devices are added */
+       eeh_add_sysfs_files(bus);
 }
 EXPORT_SYMBOL_GPL(pcibios_finish_adding_to_bus);