diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /drivers/serial/21285.c | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
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 1e3d19397a5..8681f134505 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 | } |