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/jbarnes...
[pandora-kernel.git]
/
arch
/
powerpc
/
sysdev
/
fsl_pci.c
diff --git
a/arch/powerpc/sysdev/fsl_pci.c
b/arch/powerpc/sysdev/fsl_pci.c
index
f8f7f28
..
68ca929
100644
(file)
--- a/
arch/powerpc/sysdev/fsl_pci.c
+++ b/
arch/powerpc/sysdev/fsl_pci.c
@@
-324,6
+324,11
@@
int __init fsl_add_bridge(struct device_node *dev, int is_primary)
struct resource rsrc;
const int *bus_range;
struct resource rsrc;
const int *bus_range;
+ if (!of_device_is_available(dev)) {
+ pr_warning("%s: disabled\n", dev->full_name);
+ return -ENODEV;
+ }
+
pr_debug("Adding PCI host bridge %s\n", dev->full_name);
/* Fetch host bridge registers address */
pr_debug("Adding PCI host bridge %s\n", dev->full_name);
/* Fetch host bridge registers address */