]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
tty/serial: digicolor: Fix bad usage of IS_ERR_VALUE
authorGuenter Roeck <linux@roeck-us.net>
Tue, 9 Feb 2016 15:08:59 +0000 (07:08 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Feb 2016 01:39:36 +0000 (17:39 -0800)
IS_ERR_VALUE() assumes that its parameter is an unsigned long.
It can not be used to check if an unsigned int reflects an error.
Doing so can result in the following build warning.

drivers/tty/serial/digicolor-usart.c: In function ‘digicolor_uart_probe’:
include/linux/err.h:21:38: warning:
comparison is always false due to limited range of data type
drivers/tty/serial/digicolor-usart.c:485:6: note:
in expansion of macro ‘IS_ERR_VALUE’

If that warning is seen, an error return from platform_get_irq() is missed.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/digicolor-usart.c

index a80cdad114f305ecbd64fe0f37615b0faca9950f..02ad6953b167bf2ef508ac0cc7a8508b7b9cc112 100644 (file)
@@ -453,7 +453,7 @@ static struct uart_driver digicolor_uart = {
 static int digicolor_uart_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
-       int ret, index;
+       int irq, ret, index;
        struct digicolor_port *dp;
        struct resource *res;
        struct clk *uart_clk;
@@ -481,9 +481,10 @@ static int digicolor_uart_probe(struct platform_device *pdev)
        if (IS_ERR(dp->port.membase))
                return PTR_ERR(dp->port.membase);
 
-       dp->port.irq = platform_get_irq(pdev, 0);
-       if (IS_ERR_VALUE(dp->port.irq))
-               return dp->port.irq;
+       irq = platform_get_irq(pdev, 0);
+       if (irq < 0)
+               return irq;
+       dp->port.irq = irq;
 
        dp->port.iotype = UPIO_MEM;
        dp->port.uartclk = clk_get_rate(uart_clk);