From dc9955b695f8572a6a71512f5e85276658d83f83 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Wed, 2 Sep 2009 17:07:29 +0100 Subject: [PATCH] --- yaml --- r: 160978 b: refs/heads/master c: c47a830c08a26a7c210ae16a0ffe3f56ba86ea69 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_ks8695.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ff5377de0833..72a733d619b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13f96d8f4c5a3f6a6b5e578d08869d79d690e0b2 +refs/heads/master: c47a830c08a26a7c210ae16a0ffe3f56ba86ea69 diff --git a/trunk/drivers/serial/serial_ks8695.c b/trunk/drivers/serial/serial_ks8695.c index e0665630e4da..52db5cc3f900 100644 --- a/trunk/drivers/serial/serial_ks8695.c +++ b/trunk/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); } }