diff options
| author | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2017-07-10 09:58:46 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-31 14:37:53 -0500 |
| commit | 902d886d4474a4d2661ae337f3c30dc7a8e59f28 (patch) | |
| tree | 55cb8ca98a66d1325d1ff7d516eedcec4b20b56d | |
| parent | 16f73eb02d7e1765ccab3d2018e0bd98eb93d973 (diff) | |
| download | linux-stable-902d886d4474a4d2661ae337f3c30dc7a8e59f28.tar.gz linux-stable-902d886d4474a4d2661ae337f3c30dc7a8e59f28.tar.bz2 linux-stable-902d886d4474a4d2661ae337f3c30dc7a8e59f28.zip | |
MIPS: PCI: Fix pcibios_scan_bus() NULL check code path
If pci_scan_root_bus() fails (ie returns NULL) pcibios_scan_bus() must
return immediately since the struct pci_bus pointer it returns is not valid
and cannot be used.
Move code checking the pci_scan_root_bus() return value to reinstate proper
pcibios_scanbus() error path behaviour.
Fixes: 88555b481958 ("MIPS: PCI: Support for CONFIG_PCI_DOMAINS_GENERIC")
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@imgtec.com>
| -rw-r--r-- | arch/mips/pci/pci-legacy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c index 174575a9a112..71d62f818d77 100644 --- a/arch/mips/pci/pci-legacy.c +++ b/arch/mips/pci/pci-legacy.c @@ -89,16 +89,16 @@ static void pcibios_scanbus(struct pci_controller *hose) pci_add_resource(&resources, hose->busn_resource); bus = pci_scan_root_bus(NULL, next_busno, hose->pci_ops, hose, &resources); - hose->bus = bus; - - need_domain_info = need_domain_info || pci_domain_nr(bus); - set_pci_need_domain_info(hose, need_domain_info); - if (!bus) { pci_free_resource_list(&resources); return; } + hose->bus = bus; + + need_domain_info = need_domain_info || pci_domain_nr(bus); + set_pci_need_domain_info(hose, need_domain_info); + next_busno = bus->busn_res.end + 1; /* Don't allow 8-bit bus number overflow inside the hose - reserve some space for bridges. */ |