aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/amba-pl011.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index f9b6b8213e77..f741a8b51400 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -247,10 +247,11 @@ static void pl011_modem_status(struct uart_amba_port *uap)
247static irqreturn_t pl011_int(int irq, void *dev_id) 247static irqreturn_t pl011_int(int irq, void *dev_id)
248{ 248{
249 struct uart_amba_port *uap = dev_id; 249 struct uart_amba_port *uap = dev_id;
250 unsigned long flags;
250 unsigned int status, pass_counter = AMBA_ISR_PASS_LIMIT; 251 unsigned int status, pass_counter = AMBA_ISR_PASS_LIMIT;
251 int handled = 0; 252 int handled = 0;
252 253
253 spin_lock(&uap->port.lock); 254 spin_lock_irqsave(&uap->port.lock, flags);
254 255
255 status = readw(uap->port.membase + UART011_MIS); 256 status = readw(uap->port.membase + UART011_MIS);
256 if (status) { 257 if (status) {
@@ -275,7 +276,7 @@ static irqreturn_t pl011_int(int irq, void *dev_id)
275 handled = 1; 276 handled = 1;
276 } 277 }
277 278
278 spin_unlock(&uap->port.lock); 279 spin_unlock_irqrestore(&uap->port.lock, flags);
279 280
280 return IRQ_RETVAL(handled); 281 return IRQ_RETVAL(handled);
281} 282}