aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2014-11-12 04:28:34 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-25 20:06:39 -0500
commit3c59958d5868f77741930402dfcb27e9dc8968d2 (patch)
tree0eb341aa885ad19ef7fdfce3fa79bea8249a9cdf /drivers/tty
parent54178fe6b3443249ec2dcd6eec9f2c3ebcdc3142 (diff)
tty: serial: omap_serial: line is unsigned, don't check < 0
Dan Carpenter reported: |drivers/tty/serial/8250/8250_omap.c:1025 omap8250_probe() |warn: unsigned 'up.port.line' is never less than zero. |1025 if (up.port.line < 0) { Since of_alias_get_id() and pdev->id can get negative I check for the error via ret variable. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/omap-serial.c10
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,