diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/serial/21285.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/serial/21285.c')
| -rw-r--r-- | drivers/serial/21285.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c index 1e3d19397a59..8681f1345056 100644 --- a/drivers/serial/21285.c +++ b/drivers/serial/21285.c | |||
| @@ -58,7 +58,7 @@ static const char serial21285_name[] = "Footbridge UART"; | |||
| 58 | static void serial21285_stop_tx(struct uart_port *port) | 58 | static void serial21285_stop_tx(struct uart_port *port) |
| 59 | { | 59 | { |
| 60 | if (tx_enabled(port)) { | 60 | if (tx_enabled(port)) { |
| 61 | disable_irq(IRQ_CONTX); | 61 | disable_irq_nosync(IRQ_CONTX); |
| 62 | tx_enabled(port) = 0; | 62 | tx_enabled(port) = 0; |
| 63 | } | 63 | } |
| 64 | } | 64 | } |
| @@ -74,7 +74,7 @@ static void serial21285_start_tx(struct uart_port *port) | |||
| 74 | static void serial21285_stop_rx(struct uart_port *port) | 74 | static void serial21285_stop_rx(struct uart_port *port) |
| 75 | { | 75 | { |
| 76 | if (rx_enabled(port)) { | 76 | if (rx_enabled(port)) { |
| 77 | disable_irq(IRQ_CONRX); | 77 | disable_irq_nosync(IRQ_CONRX); |
| 78 | rx_enabled(port) = 0; | 78 | rx_enabled(port) = 0; |
| 79 | } | 79 | } |
| 80 | } | 80 | } |