diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 18:17:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 18:17:21 -0800 |
| commit | 7f729ccff35befa08a836ab33a4372c7f6735645 (patch) | |
| tree | 0719139e279c8054d734df5be78154f3b536f22f /drivers/serial/sa1100.c | |
| parent | cbc749518235b0f1dacb867c8c25059a1b876276 (diff) | |
| parent | ee31b337852ca8a65840702544ff5c64d37740f5 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial/sa1100.c')
| -rw-r--r-- | drivers/serial/sa1100.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index fd9deee20e05..0e3daf6d7b50 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c @@ -156,7 +156,7 @@ static void sa1100_stop_tx(struct uart_port *port) } /* - * interrupts may not be disabled on entry + * port locked and interrupts disabled */ static void sa1100_start_tx(struct uart_port *port) { @@ -164,11 +164,9 @@ static void sa1100_start_tx(struct uart_port *port) unsigned long flags; u32 utcr3; - spin_lock_irqsave(&sport->port.lock, flags); utcr3 = UART_GET_UTCR3(sport); sport->port.read_status_mask |= UTSR0_TO_SM(UTSR0_TFS); UART_PUT_UTCR3(sport, utcr3 | UTCR3_TIE); - spin_unlock_irqrestore(&sport->port.lock, flags); } /* |