summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPrabhakar Kushwaha <prabhakar@freescale.com>2011-04-06 12:56:29 +0530
committerKumar Gala <galak@kernel.crashing.org>2011-04-12 06:29:21 -0500
commit07d9fce24d871785dbd25458469032fea73f17b8 (patch)
tree9888253d34e3206c4a07e83d4a17ea4162724e6b /arch
parentef1fd2df85f5ea8ca8876a45d0ebb152d3a144d1 (diff)
downloadlinux-stable-07d9fce24d871785dbd25458469032fea73f17b8.tar.gz
linux-stable-07d9fce24d871785dbd25458469032fea73f17b8.tar.bz2
linux-stable-07d9fce24d871785dbd25458469032fea73f17b8.zip
powerpc: Check device status before adding serial device
serial port nodes with the property status="disabled" are not usable and so avoid adding "disabled" port with the system. Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/legacy_serial.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index c834757bebc0..2b97b80d6d7d 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -330,9 +330,11 @@ void __init find_legacy_serial_ports(void)
if (!parent)
continue;
if (of_match_node(legacy_serial_parents, parent) != NULL) {
- index = add_legacy_soc_port(np, np);
- if (index >= 0 && np == stdout)
- legacy_serial_console = index;
+ if (of_device_is_available(np)) {
+ index = add_legacy_soc_port(np, np);
+ if (index >= 0 && np == stdout)
+ legacy_serial_console = index;
+ }
}
of_node_put(parent);
}