summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorMartin Sperl <kernel@martin.sperl.org>2016-02-09 11:47:16 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-14 17:39:36 -0800
commite1a7d248279e375896cf53e9cb980032a84bf83e (patch)
tree5d3949e5c842dd522b842d99a74c8c762bf65dd2 /drivers/tty
parent0ab556c26690452fd66d8c95513fee201ceafbc0 (diff)
downloadlinux-e1a7d248279e375896cf53e9cb980032a84bf83e.tar.bz2
serial: bcm2835: fix unsigned int issue with irq
Fixes error condition check when requesting the irq, that would not trigger because of uart_port.irq being defined as unsigned int. Reported by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Martin Sperl <kernel@martin.sperl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/8250/8250_bcm2835aux.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c b/drivers/tty/serial/8250/8250_bcm2835aux.c
index ecf89f13a13b..e10f1244409b 100644
--- a/drivers/tty/serial/8250/8250_bcm2835aux.c
+++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
@@ -59,12 +59,12 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev)
}
/* get the interrupt */
- data->uart.port.irq = platform_get_irq(pdev, 0);
- if (data->uart.port.irq < 0) {
- dev_err(&pdev->dev, "irq not found - %i",
- data->uart.port.irq);
- return data->uart.port.irq;
+ ret = platform_get_irq(pdev, 0);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "irq not found - %i", ret);
+ return ret;
}
+ data->uart.port.irq = ret;
/* map the main registers */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);