From c47a830c08a26a7c210ae16a0ffe3f56ba86ea69 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Wed, 2 Sep 2009 17:07:29 +0100 Subject: ARM: 5688/1: ks8695_serial: disable_irq() lockup disable_irq() cannot be called from interrupt context without self imposed deadlock. This was happening in ks8695uart_stop_tx(). Signed-off-by: Dick Hollenbeck Signed-off-by: Russell King --- drivers/serial/serial_ks8695.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'drivers/serial/serial_ks8695.c') diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c index e066563..52db5cc 100644 --- a/drivers/serial/serial_ks8695.c +++ b/drivers/serial/serial_ks8695.c @@ -110,7 +110,11 @@ static struct console ks8695_console; static void ks8695uart_stop_tx(struct uart_port *port) { if (tx_enabled(port)) { - disable_irq(KS8695_IRQ_UART_TX); + /* use disable_irq_nosync() and not disable_irq() to avoid self + * imposed deadlock by not waiting for irq handler to end, + * since this ks8695uart_stop_tx() is called from interrupt context. + */ + disable_irq_nosync(KS8695_IRQ_UART_TX); tx_enable(port, 0); } } -- cgit v1.1