From 8022a4c5e6e2648a8acf3407d1a805ccb61a2bd7 Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Wed, 16 Jun 2010 05:16:59 +0000 Subject: [PATCH] --- yaml --- r: 200908 b: refs/heads/master c: d3005fbc696781d2fd7bd5b5389a94fae5332b58 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/iseries/pci.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 69887fc7c5a2..8e94384e7018 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33ad5e4b6cab3ad8cf3afda49b66393f1833150e +refs/heads/master: d3005fbc696781d2fd7bd5b5389a94fae5332b58 diff --git a/trunk/arch/powerpc/platforms/iseries/pci.c b/trunk/arch/powerpc/platforms/iseries/pci.c index 3fc2e6494b8b..ab3962b0d246 100644 --- a/trunk/arch/powerpc/platforms/iseries/pci.c +++ b/trunk/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); } /*