The /chosen/linux,stdout-path is "deprecated" in favour of
/chosen/stdout-path so we should be checking for both.

Signed-off-by: Oliver O'Halloran <ooh...@gmail.com>
---
 arch/powerpc/boot/serial.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index a7f9ac9a27b5..9ef1ed35ae62 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -92,7 +92,8 @@ static void *serial_get_stdout_devp(void)
        if (devp == NULL)
                goto err_out;
 
-       if (getprop(devp, "linux,stdout-path", path, MAX_PATH_LEN) > 0) {
+       if (getprop(devp, "linux,stdout-path", path, MAX_PATH_LEN) > 0 ||
+               getprop(devp, "stdout-path", path, MAX_PATH_LEN) > 0) {
                devp = finddevice(path);
                if (devp == NULL)
                        goto err_out;
-- 
2.9.5

Reply via email to