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

This reverts commit 908fd7e566b4c12e36e4487d2d5946de5e5ea30f.

Kevin writes:
	Greg, without a better justification in the changelog, I think
	this patch should be dropped from tty-next.

Reported-by: Kevin Hilman <khilman@linaro.org>
Cc: Ruchika Kharwar <ruchika@ti.com>
Cc: Alexander Savchenko <oleksandr.savchenko@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 2fa7b5ce2e0c..b0f46e666e1a 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -538,6 +538,7 @@ 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);
@@ -548,6 +549,7 @@ 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 */
@@ -586,7 +588,7 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id)
         pm_runtime_put_autosuspend(up->dev);
         up->port_activity = jiffies;
 
-        return IRQ_HANDLED;
+        return ret;
 }
 
 static unsigned int serial_omap_tx_empty(struct uart_port *port)