From 69414d6342880c87f6754410910a0665e9fe72bf Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 22 Dec 2010 17:16:09 +0000 Subject: [PATCH] --- yaml --- r: 225786 b: refs/heads/master c: 963cc981af620c7c07b5f6d1ab998b639e90ecb1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/amba-pl011.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e4859cdd666d..d2ddaf902937 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffca2b114c6a804d1307781df687e877a373a1c2 +refs/heads/master: 963cc981af620c7c07b5f6d1ab998b639e90ecb1 diff --git a/trunk/drivers/serial/amba-pl011.c b/trunk/drivers/serial/amba-pl011.c index f9b6b8213e77..f741a8b51400 100644 --- a/trunk/drivers/serial/amba-pl011.c +++ b/trunk/drivers/serial/amba-pl011.c @@ -247,10 +247,11 @@ static void pl011_modem_status(struct uart_amba_port *uap) static irqreturn_t pl011_int(int irq, void *dev_id) { struct uart_amba_port *uap = dev_id; + unsigned long flags; unsigned int status, pass_counter = AMBA_ISR_PASS_LIMIT; int handled = 0; - spin_lock(&uap->port.lock); + spin_lock_irqsave(&uap->port.lock, flags); status = readw(uap->port.membase + UART011_MIS); if (status) { @@ -275,7 +276,7 @@ static irqreturn_t pl011_int(int irq, void *dev_id) handled = 1; } - spin_unlock(&uap->port.lock); + spin_unlock_irqrestore(&uap->port.lock, flags); return IRQ_RETVAL(handled); }