serial: omap: Fix IRQ handling return value
authorRuchika Kharwar <ruchika@ti.com>
Wed, 17 Jul 2013 13:29:13 +0000 (16:29 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2013 22:55:44 +0000 (15:55 -0700)
Ensure the Interrupt handling routine return IRQ_HANDLED vs
IRQ_NONE.

Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
Signed-off-by: Alexander Savchenko <oleksandr.savchenko@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/omap-serial.c

index 72bb690829afea9c1b2e6f261a8f807aeb4a4c49..b0802149b3e7e66aacadb8d90ca229428a495156 100644 (file)
@@ -485,7 +485,6 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id)
        struct uart_omap_port *up = dev_id;
        unsigned int iir, lsr;
        unsigned int type;
-       irqreturn_t ret = IRQ_NONE;
        int max_count = 256;
 
        spin_lock(&up->port.lock);
@@ -496,7 +495,6 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id)
                if (iir & UART_IIR_NO_INT)
                        break;
 
-               ret = IRQ_HANDLED;
                lsr = serial_in(up, UART_LSR);
 
                /* extract IRQ type from IIR register */
@@ -535,7 +533,7 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id)
        pm_runtime_put_autosuspend(up->dev);
        up->port_activity = jiffies;
 
-       return ret;
+       return IRQ_HANDLED;
 }
 
 static unsigned int serial_omap_tx_empty(struct uart_port *port)