summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorYijing Wang2015-03-12 21:05:56 +0100
committerBjorn Helgaas2015-03-19 16:17:20 +0100
commita0c8a4d9f92d1ecd053eaa0e6cde7b4f24af97a8 (patch)
treed2146f255cc3fc4bfa18e7b5bea0cd1bbb09ae55 /arch/sparc/kernel
parentPCI: Assign resources before drivers claim devices (pci_scan_root_bus()) (diff)
downloadkernel-qcow2-linux-a0c8a4d9f92d1ecd053eaa0e6cde7b4f24af97a8.tar.gz
kernel-qcow2-linux-a0c8a4d9f92d1ecd053eaa0e6cde7b4f24af97a8.tar.xz
kernel-qcow2-linux-a0c8a4d9f92d1ecd053eaa0e6cde7b4f24af97a8.zip
sparc/PCI: Claim bus resources before pci_bus_add_devices()
Pci_claim_bus_resources() should be called before pci_bus_add_devices(), or driver may failed to load, because the resources had not claimed. Signed-off-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r--arch/sparc/kernel/pci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 9ce5afe167ff..9e267cae683e 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -677,11 +677,10 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
}
pci_of_scan_bus(pbm, node, bus);
- pci_bus_add_devices(bus);
pci_bus_register_of_sysfs(bus);
pci_claim_bus_resources(bus);
-
+ pci_bus_add_devices(bus);
return bus;
}