These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / tty / serial / lpc32xx_hs.c

diff --git a/kernel/drivers/tty/serial/lpc32xx_hs.c b/kernel/drivers/tty/serial/lpc32xx_hs.c
index e92d7eb..7eb04ae 100644 (file)
--- a/kernel/drivers/tty/serial/lpc32xx_hs.c
+++ b/kernel/drivers/tty/serial/lpc32xx_hs.c
@@ -691,12 +691,13 @@ static int serial_hs_lpc32xx_probe(struct platform_device *pdev)
        p->port.mapbase = res->start;
        p->port.membase = NULL;
 
-       p->port.irq = platform_get_irq(pdev, 0);
-       if (p->port.irq < 0) {
+       ret = platform_get_irq(pdev, 0);
+       if (ret < 0) {
                dev_err(&pdev->dev, "Error getting irq for HS UART port %d\n",
                        uarts_registered);
-               return p->port.irq;
+               return ret;
        }
+       p->port.irq = ret;
 
        p->port.iotype = UPIO_MEM32;
        p->port.uartclk = LPC32XX_MAIN_OSC_FREQ;