leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Kevin Hilman <khilman@kernel.org>
Tested-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stephen Boyd 2014-11-14 10:39:21 -08:00 committed by Greg Kroah-Hartman
parent 52c40fca1a
commit 7920408b0c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/tty/serial/msm_serial.c
View File

@ -1046,14 +1046,14 @@ static int msm_serial_probe(struct platform_device *pdev)
const struct of_device_id *id; const struct of_device_id *id;
int irq, line; int irq, line;
if (pdev->id == -1)
pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
if (pdev->dev.of_node) if (pdev->dev.of_node)
line = of_alias_get_id(pdev->dev.of_node, "serial"); line = of_alias_get_id(pdev->dev.of_node, "serial");
else else
line = pdev->id; line = pdev->id;
if (line < 0)
line = atomic_inc_return(&msm_uart_next_id) - 1;
if (unlikely(line < 0 || line >= UART_NR)) if (unlikely(line < 0 || line >= UART_NR))
return -ENXIO; return -ENXIO;