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

Commit 7a6fbc9a authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Greg Kroah-Hartman
Browse files

ARM: clps711x: serial driver hungs are a result of call disable_irq within ISR 



Since 2.6.30-rc1 clps711x serial driver hungs system. This is a result
of call disable_irq from ISR. synchronize_irq waits for end of interrupt
and goes to infinite loop. This patch fix this problem.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e816b57a

drivers/tty/serial/clps711x.c

+8 −6
Original line number Diff line number Diff line
@@ -154,10 +154,9 @@ static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id) 
		port->x_char = 0;

		return IRQ_HANDLED;

	}

	if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {

		clps711xuart_stop_tx(port);

		return IRQ_HANDLED;

	}



	if (uart_circ_empty(xmit) || uart_tx_stopped(port))

		goto disable_tx_irq;



	count = port->fifosize >> 1;

	do {
@@ -171,8 +170,11 @@ static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id) 
	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)

		uart_write_wakeup(port);



	if (uart_circ_empty(xmit))

		clps711xuart_stop_tx(port);

	if (uart_circ_empty(xmit)) {

	disable_tx_irq:

		disable_irq_nosync(TX_IRQ(port));

		tx_enabled(port) = 0;

	}



	return IRQ_HANDLED;

}