diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 13:42:48 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 13:42:52 +0400 |
| commit | 4708ac49305bbcd511600d4af71a4c6dca15af65 (patch) | |
| tree | 77ba5c83a7d4f4a119e3fd524d82adc297df1e35 /arch/powerpc/platforms/iseries/pci.c | |
| parent | 1dbd30e9890fd69e50b17edd70ca583546b0fe4e (diff) | |
| parent | 2f7989efd4398d92b8adffce2e07dd043a0895fe (diff) | |
| download | linux-4708ac49305bbcd511600d4af71a4c6dca15af65.tar.xz | |
Merge branch 'origin' into misc
Diffstat (limited to 'arch/powerpc/platforms/iseries/pci.c')
| -rw-r--r-- | arch/powerpc/platforms/iseries/pci.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c index 3fc2e6494b8b..ab3962b0d246 100644 --- a/arch/powerpc/platforms/iseries/pci.c +++ b/arch/powerpc/platforms/iseries/pci.c @@ -445,7 +445,11 @@ void __init iSeries_pcibios_fixup_resources(struct pci_dev *pdev) } allocate_device_bars(pdev); - iseries_device_information(pdev, bus, *sub_bus); + if (likely(sub_bus)) + iseries_device_information(pdev, bus, *sub_bus); + else + printk(KERN_ERR "PCI: Device node %s has missing or invalid " + "linux,subbus property\n", node->full_name); } /* |