Skip to content

Commit

Permalink
tty: serial: 8250: omap: line is unsigned, don't check < 0
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sebastian Andrzej Siewior authored and Greg Kroah-Hartman committed Nov 26, 2014
1 parent 6b1f40c commit 54178fe
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/tty/serial/8250/8250_omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 54178fe

Please sign in to comment.