diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 18:02:59 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 18:02:59 +0900 |
| commit | 0858d9c0c591ce9baa1baf72eaf6f67823f3bc25 (patch) | |
| tree | 1ea697a8e34ff1784572db22bcb5c9da7bbfb40c /drivers/serial | |
| parent | 9d7302299ee96ca954fe4ab8ca640333b6e19ad0 (diff) | |
| parent | 963e04cafbf001ec431025a46ec246ae6d89daba (diff) | |
| download | op-kernel-dev-0858d9c0c591ce9baa1baf72eaf6f67823f3bc25.zip op-kernel-dev-0858d9c0c591ce9baa1baf72eaf6f67823f3bc25.tar.gz | |
Merge branch 'sh/hwblk' into sh/pm-runtime
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/sh-sci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 8e2feb5..4cbb87a 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c @@ -662,10 +662,11 @@ static irqreturn_t sci_rx_interrupt(int irq, void *port) static irqreturn_t sci_tx_interrupt(int irq, void *ptr) { struct uart_port *port = ptr; + unsigned long flags; - spin_lock_irq(&port->lock); + spin_lock_irqsave(&port->lock, flags); sci_transmit_chars(port); - spin_unlock_irq(&port->lock); + spin_unlock_irqrestore(&port->lock, flags); return IRQ_HANDLED; } |
