diff options
Diffstat (limited to 'arch/powerpc/kernel/legacy_serial.c')
| -rw-r--r-- | arch/powerpc/kernel/legacy_serial.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index 33b34a58fc62..5b9dce17f0c9 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c | |||
| @@ -372,6 +372,8 @@ void __init find_legacy_serial_ports(void) | |||
| 372 | 372 | ||
| 373 | /* Now find out if one of these is out firmware console */ | 373 | /* Now find out if one of these is out firmware console */ |
| 374 | path = of_get_property(of_chosen, "linux,stdout-path", NULL); | 374 | path = of_get_property(of_chosen, "linux,stdout-path", NULL); |
| 375 | if (path == NULL) | ||
| 376 | path = of_get_property(of_chosen, "stdout-path", NULL); | ||
| 375 | if (path != NULL) { | 377 | if (path != NULL) { |
| 376 | stdout = of_find_node_by_path(path); | 378 | stdout = of_find_node_by_path(path); |
| 377 | if (stdout) | 379 | if (stdout) |
| @@ -595,8 +597,10 @@ static int __init check_legacy_serial_console(void) | |||
| 595 | /* We are getting a weird phandle from OF ... */ | 597 | /* We are getting a weird phandle from OF ... */ |
| 596 | /* ... So use the full path instead */ | 598 | /* ... So use the full path instead */ |
| 597 | name = of_get_property(of_chosen, "linux,stdout-path", NULL); | 599 | name = of_get_property(of_chosen, "linux,stdout-path", NULL); |
| 600 | if (name == NULL) | ||
| 601 | name = of_get_property(of_chosen, "stdout-path", NULL); | ||
| 598 | if (name == NULL) { | 602 | if (name == NULL) { |
| 599 | DBG(" no linux,stdout-path !\n"); | 603 | DBG(" no stdout-path !\n"); |
| 600 | return -ENODEV; | 604 | return -ENODEV; |
| 601 | } | 605 | } |
| 602 | prom_stdout = of_find_node_by_path(name); | 606 | prom_stdout = of_find_node_by_path(name); |
