diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-15 13:03:13 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-14 14:58:21 +1000 |
commit | e0f5fa99a378d6910d234f3c8998aebfe2f54745 (patch) | |
tree | 4818750ef6773042ff2898b73aff6de57788499f /arch/powerpc | |
parent | 309257484cc1a592e8ac5fbdd8cd661be2b80bf8 (diff) | |
download | op-kernel-dev-e0f5fa99a378d6910d234f3c8998aebfe2f54745.zip op-kernel-dev-e0f5fa99a378d6910d234f3c8998aebfe2f54745.tar.gz |
powerpc: Check "status" property before adding legacy ISA serial ports
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/legacy_serial.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index 9a4d9fe..c9c469f 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c @@ -386,9 +386,11 @@ void __init find_legacy_serial_ports(void) struct device_node *isa = of_get_parent(np); if (isa && (!strcmp(isa->name, "isa") || !strcmp(isa->name, "lpc"))) { - index = add_legacy_isa_port(np, isa); - if (index >= 0 && np == stdout) - legacy_serial_console = index; + if (of_device_is_available(np)) { + index = add_legacy_isa_port(np, isa); + if (index >= 0 && np == stdout) + legacy_serial_console = index; + } } of_node_put(isa); } |