[PATCH] serial: omap: Fix IRQ handling return value

From: Alexander Savchenko
Date: Wed Jul 17 2013 - 09:29:37 EST


From: Ruchika Kharwar <ruchika@xxxxxx>

Ensure the Interrupt handling routine return IRQ_HANDLED vs
IRQ_NONE.

Signed-off-by: Ruchika Kharwar <ruchika@xxxxxx>
Signed-off-by: Alexander Savchenko <oleksandr.savchenko@xxxxxx>
---
drivers/tty/serial/omap-serial.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index b6d1728..70feeb3 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -479,7 +479,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);
@@ -490,7 +489,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 */
@@ -529,7 +527,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)
--
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/