]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
tty: serial: 8250: omap: line is unsigned, don't check < 0
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Wed, 12 Nov 2014 09:28:33 +0000 (10:28 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Nov 2014 01:06:38 +0000 (17:06 -0800)
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) {

I (wrongly) assumed that line is an int and compiler didn't complain nor
did sparse. 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>
drivers/tty/serial/8250/8250_omap.c

index 57a8b1241b85c8dd9947f48bcdccdcdad9108efd..336602eb453eb7e419f89168958153c7a9477d85 100644 (file)
@@ -1014,19 +1014,20 @@ static int omap8250_probe(struct platform_device *pdev)
        up.port.unthrottle = omap_8250_unthrottle;
 
        if (pdev->dev.of_node) {
-               up.port.line = of_alias_get_id(pdev->dev.of_node, "serial");
+               ret = of_alias_get_id(pdev->dev.of_node, "serial");
+
                of_property_read_u32(pdev->dev.of_node, "clock-frequency",
                                     &up.port.uartclk);
                priv->wakeirq = irq_of_parse_and_map(pdev->dev.of_node, 1);
        } else {
-               up.port.line = pdev->id;
+               ret = pdev->id;
        }
-
-       if (up.port.line < 0) {
-               dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n",
-                       up.port.line);
-               return -ENODEV;
+       if (ret < 0) {
+               dev_err(&pdev->dev, "failed to get alias/pdev id\n");
+               return ret;
        }
+       up.port.line = ret;
+
        if (!up.port.uartclk) {
                up.port.uartclk = DEFAULT_CLK_SPEED;
                dev_warn(&pdev->dev,