Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7920408b authored by Stephen Boyd's avatar Stephen Boyd Committed by Greg Kroah-Hartman
Browse files

tty: serial: msm_serial: Don't require DT aliases 



If there isn't a DT alias then of_alias_get_id() will return
-ENODEV. This will cause the msm_serial driver to fail probe,
when we want to keep the previous behavior where we generated a
dynamic line number at probe time. Restore this behavior by
generating a dynamic id if the line number is still negative
after checking for an alias or in the non-DT case looking at the
.id field of the platform device.

Reported-by: default avatarKevin Hilman <khilman@kernel.org>
Tested-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 52c40fca

drivers/tty/serial/msm_serial.c

+3 −3
Original line number Diff line number Diff line
@@ -1046,14 +1046,14 @@ static int msm_serial_probe(struct platform_device *pdev) 
	const struct of_device_id *id;

	int irq, line;



	if (pdev->id == -1)

		pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;



	if (pdev->dev.of_node)

		line = of_alias_get_id(pdev->dev.of_node, "serial");

	else

		line = pdev->id;



	if (line < 0)

		line = atomic_inc_return(&msm_uart_next_id) - 1;



	if (unlikely(line < 0 || line >= UART_NR))

		return -ENXIO;