diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-01-19 18:25:13 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-01-19 18:25:13 +0400 |
| commit | 8511c8cce280177ec9999d162e0f63bddfdbc732 (patch) | |
| tree | a7182fd6c43b540586101b25dad9e319b31548b9 /drivers/tty/serial/atmel_serial.c | |
| parent | b93b9d935637fc8ecc90d163587bd37201de3aed (diff) | |
| parent | b8ed9e5b8c34dc9fb1882669e45b21e3d0194881 (diff) | |
Merge branch 'linux-3.2.y' into linux-linaro-3.2
Diffstat (limited to 'drivers/tty/serial/atmel_serial.c')
| -rw-r--r-- | drivers/tty/serial/atmel_serial.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 4c823f341d9..90c8e3a4922 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -212,8 +212,9 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) { struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); unsigned int mode; + unsigned long flags; - spin_lock(&port->lock); + spin_lock_irqsave(&port->lock, flags); /* Disable interrupts */ UART_PUT_IDR(port, atmel_port->tx_done_mask); @@ -244,7 +245,7 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) /* Enable interrupts */ UART_PUT_IER(port, atmel_port->tx_done_mask); - spin_unlock(&port->lock); + spin_unlock_irqrestore(&port->lock, flags); } |