Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/tty/serial/omap-serial.c

+3 −1
Original line number Diff line number Diff line
@@ -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)