Commit 7b013e44 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "serial: omap: Fix IRQ handling return value"

This reverts commit 908fd7e5.

Kevin writes:
	Greg, without a better justification in the changelog, I think
	this patch should be dropped from tty-next.
Reported-by: default avatarKevin Hilman <khilman@linaro.org>
Cc: Ruchika Kharwar <ruchika@ti.com>
Cc: Alexander Savchenko <oleksandr.savchenko@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8316d04c
...@@ -538,6 +538,7 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id) ...@@ -538,6 +538,7 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id)
struct uart_omap_port *up = dev_id; struct uart_omap_port *up = dev_id;
unsigned int iir, lsr; unsigned int iir, lsr;
unsigned int type; unsigned int type;
irqreturn_t ret = IRQ_NONE;
int max_count = 256; int max_count = 256;
spin_lock(&up->port.lock); spin_lock(&up->port.lock);
...@@ -548,6 +549,7 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id) ...@@ -548,6 +549,7 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id)
if (iir & UART_IIR_NO_INT) if (iir & UART_IIR_NO_INT)
break; break;
ret = IRQ_HANDLED;
lsr = serial_in(up, UART_LSR); lsr = serial_in(up, UART_LSR);
/* extract IRQ type from IIR register */ /* extract IRQ type from IIR register */
...@@ -586,7 +588,7 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id) ...@@ -586,7 +588,7 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id)
pm_runtime_put_autosuspend(up->dev); pm_runtime_put_autosuspend(up->dev);
up->port_activity = jiffies; up->port_activity = jiffies;
return IRQ_HANDLED; return ret;
} }
static unsigned int serial_omap_tx_empty(struct uart_port *port) static unsigned int serial_omap_tx_empty(struct uart_port *port)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment