diff options
author | Ruchika Kharwar <ruchika@ti.com> | 2013-07-17 09:29:13 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-26 18:55:44 -0400 |
commit | 908fd7e566b4c12e36e4487d2d5946de5e5ea30f (patch) | |
tree | 09b9fabe5073e231e312bdbbead826a3642abd05 /drivers/tty/serial/omap-serial.c | |
parent | a0a490f9df2bf7e077054c78221c6b5301681de6 (diff) |
serial: omap: Fix IRQ handling return value
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>
Diffstat (limited to 'drivers/tty/serial/omap-serial.c')
-rw-r--r-- | drivers/tty/serial/omap-serial.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 72bb690829af..b0802149b3e7 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c | |||
@@ -485,7 +485,6 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id) | |||
485 | struct uart_omap_port *up = dev_id; | 485 | struct uart_omap_port *up = dev_id; |
486 | unsigned int iir, lsr; | 486 | unsigned int iir, lsr; |
487 | unsigned int type; | 487 | unsigned int type; |
488 | irqreturn_t ret = IRQ_NONE; | ||
489 | int max_count = 256; | 488 | int max_count = 256; |
490 | 489 | ||
491 | spin_lock(&up->port.lock); | 490 | spin_lock(&up->port.lock); |
@@ -496,7 +495,6 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id) | |||
496 | if (iir & UART_IIR_NO_INT) | 495 | if (iir & UART_IIR_NO_INT) |
497 | break; | 496 | break; |
498 | 497 | ||
499 | ret = IRQ_HANDLED; | ||
500 | lsr = serial_in(up, UART_LSR); | 498 | lsr = serial_in(up, UART_LSR); |
501 | 499 | ||
502 | /* extract IRQ type from IIR register */ | 500 | /* extract IRQ type from IIR register */ |
@@ -535,7 +533,7 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id) | |||
535 | pm_runtime_put_autosuspend(up->dev); | 533 | pm_runtime_put_autosuspend(up->dev); |
536 | up->port_activity = jiffies; | 534 | up->port_activity = jiffies; |
537 | 535 | ||
538 | return ret; | 536 | return IRQ_HANDLED; |
539 | } | 537 | } |
540 | 538 | ||
541 | static unsigned int serial_omap_tx_empty(struct uart_port *port) | 539 | static unsigned int serial_omap_tx_empty(struct uart_port *port) |