From f83e3feb8c6cc325457f5d5ada6721c4e3442945 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 14 Apr 2009 11:06:49 +0100 Subject: [PATCH] --- yaml --- r: 143548 b: refs/heads/master c: 41609ff43005de11dadfb0ccadb344f0e2966829 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/samsung.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7f574b7d087f..2c732bebfa9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fa264d0d327a67db4913b400bcfb174d929054c +refs/heads/master: 41609ff43005de11dadfb0ccadb344f0e2966829 diff --git a/trunk/drivers/serial/samsung.c b/trunk/drivers/serial/samsung.c index 41ac94872b8d..e06686ae858b 100644 --- a/trunk/drivers/serial/samsung.c +++ b/trunk/drivers/serial/samsung.c @@ -127,7 +127,7 @@ static void s3c24xx_serial_stop_tx(struct uart_port *port) struct s3c24xx_uart_port *ourport = to_ourport(port); if (tx_enabled(port)) { - disable_irq(ourport->tx_irq); + disable_irq_nosync(ourport->tx_irq); tx_enabled(port) = 0; if (port->flags & UPF_CONS_FLOW) s3c24xx_serial_rx_enable(port); @@ -154,7 +154,7 @@ static void s3c24xx_serial_stop_rx(struct uart_port *port) if (rx_enabled(port)) { dbg("s3c24xx_serial_stop_rx: port=%p\n", port); - disable_irq(ourport->rx_irq); + disable_irq_nosync(ourport->rx_irq); rx_enabled(port) = 0; } }