Skip to content

Commit

Permalink
serial: omap: Fix IRQ handling return value
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ruchika Kharwar authored and Greg Kroah-Hartman committed Jul 26, 2013
1 parent a0a490f commit 908fd7e
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/tty/serial/omap-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 */
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 908fd7e

Please sign in to comment.