Merge branch 'fix/asoc' of git://github.com/tiwai/sound

[pandora-kernel.git] / drivers / pci / of.c

diff --git a/drivers/pci/of.c b/drivers/pci/of.c
index c94d37e..f092993 100644 (file)
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
@@ -55,7 +55,7 @@ struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus)
         */
        if (bus->bridge->of_node)
                return of_node_get(bus->bridge->of_node);
-       if (bus->bridge->parent->of_node)
+       if (bus->bridge->parent && bus->bridge->parent->of_node)
                return of_node_get(bus->bridge->parent->of_node);
        return NULL;
 }