git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
of_platform.c
diff --git
a/arch/powerpc/kernel/of_platform.c
b/arch/powerpc/kernel/of_platform.c
index
fb698d4
..
e79ad8a
100644
(file)
--- a/
arch/powerpc/kernel/of_platform.c
+++ b/
arch/powerpc/kernel/of_platform.c
@@
-275,6
+275,8
@@
static int __devinit of_pci_phb_probe(struct of_device *dev,
/* Scan the bus */
scan_phb(phb);
+ if (phb->bus == NULL)
+ return -ENXIO;
/* Claim resources. This might need some rework as well depending
* wether we are doing probe-only or not, like assigning unassigned