diff options
-rw-r--r-- | drivers/tty/serial/omap-serial.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index e0bec06a5f60..435478a245d3 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c | |||
@@ -1653,16 +1653,16 @@ static int serial_omap_probe(struct platform_device *pdev) | |||
1653 | up->port.ops = &serial_omap_pops; | 1653 | up->port.ops = &serial_omap_pops; |
1654 | 1654 | ||
1655 | if (pdev->dev.of_node) | 1655 | if (pdev->dev.of_node) |
1656 | up->port.line = of_alias_get_id(pdev->dev.of_node, "serial"); | 1656 | ret = of_alias_get_id(pdev->dev.of_node, "serial"); |
1657 | else | 1657 | else |
1658 | up->port.line = pdev->id; | 1658 | ret = pdev->id; |
1659 | 1659 | ||
1660 | if (up->port.line < 0) { | 1660 | if (ret < 0) { |
1661 | dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n", | 1661 | dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n", |
1662 | up->port.line); | 1662 | ret); |
1663 | ret = -ENODEV; | ||
1664 | goto err_port_line; | 1663 | goto err_port_line; |
1665 | } | 1664 | } |
1665 | up->port.line = ret; | ||
1666 | 1666 | ||
1667 | if (up->port.line >= OMAP_MAX_HSUART_PORTS) { | 1667 | if (up->port.line >= OMAP_MAX_HSUART_PORTS) { |
1668 | dev_err(&pdev->dev, "uart ID %d > MAX %d.\n", up->port.line, | 1668 | dev_err(&pdev->dev, "uart ID %d > MAX %d.\n", up->port.line, |