Skip to content

Commit 9bbc7e4

Browse files
oohalmpe
authored andcommitted
powerpc/zImage: Also check for stdout-path
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 <oohall@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
1 parent 505a314 commit 9bbc7e4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/powerpc/boot/serial.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ static void *serial_get_stdout_devp(void)
9393
if (devp == NULL)
9494
goto err_out;
9595

96-
if (getprop(devp, "linux,stdout-path", path, MAX_PATH_LEN) > 0) {
96+
if (getprop(devp, "linux,stdout-path", path, MAX_PATH_LEN) > 0 ||
97+
getprop(devp, "stdout-path", path, MAX_PATH_LEN) > 0) {
9798
devp = finddevice(path);
9899
if (devp == NULL)
99100
goto err_out;

0 commit comments

Comments
 (0)