Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd9b5588 authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman
Browse files

tty/serial: digicolor: Fix bad usage of IS_ERR_VALUE 



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: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f5405c9

drivers/tty/serial/digicolor-usart.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -453,7 +453,7 @@ static struct uart_driver digicolor_uart = { 
static int digicolor_uart_probe(struct platform_device *pdev)

static int digicolor_uart_probe(struct platform_device *pdev)

{

{

	struct device_node *np = pdev->dev.of_node;

	struct device_node *np = pdev->dev.of_node;

	int ret, index;

	int irq, ret, index;

	struct digicolor_port *dp;

	struct digicolor_port *dp;

	struct resource *res;

	struct resource *res;

	struct clk *uart_clk;

	struct clk *uart_clk;
@@ -481,9 +481,10 @@ static int digicolor_uart_probe(struct platform_device *pdev) 
	if (IS_ERR(dp->port.membase))

	if (IS_ERR(dp->port.membase))

		return PTR_ERR(dp->port.membase);

		return PTR_ERR(dp->port.membase);





	dp->port.irq = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);

	if (IS_ERR_VALUE(dp->port.irq))

	if (irq < 0)

		return dp->port.irq;

		return irq;

	dp->port.irq = irq;





	dp->port.iotype = UPIO_MEM;

	dp->port.iotype = UPIO_MEM;

	dp->port.uartclk = clk_get_rate(uart_clk);

	dp->port.uartclk = clk_get_rate(uart_clk);