Merge branch 'sh/hwblk' into sh/pm-runtime

This commit is contained in:
Paul Mundt 2009-08-23 18:02:59 +09:00
commit 0858d9c0c5
109 changed files with 6560 additions and 1791 deletions

View file

@ -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;
}