From a9c590a63e5c7ab0456f95b3ef5b5fb412049b08 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 6 Sep 2012 15:45:30 +0300 Subject: [PATCH] --- yaml --- r: 325731 b: refs/heads/master c: 6c3a30c7fbed820f65d5e708f1e83468d8ec9921 h: refs/heads/master i: 325729: 0dc8f7e87d310274c9c68608f3a4b1b546aec01c 325727: 4e0212d157072cd722ff7762ee0b794b05fb3868 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/omap-serial.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 69fa48bbb043..07bc33b4258d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e9c8e7dbf3b9cc94947d76cb57985682517cc6e +refs/heads/master: 6c3a30c7fbed820f65d5e708f1e83468d8ec9921 diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/drivers/tty/serial/omap-serial.c index 0ceca4457d3b..99042b0fb941 100644 --- a/trunk/drivers/tty/serial/omap-serial.c +++ b/trunk/drivers/tty/serial/omap-serial.c @@ -351,11 +351,10 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) struct tty_struct *tty = up->port.state->port.tty; unsigned int iir, lsr; unsigned int type; - unsigned long flags; irqreturn_t ret = IRQ_NONE; int max_count = 256; - spin_lock_irqsave(&up->port.lock, flags); + spin_lock(&up->port.lock); pm_runtime_get_sync(up->dev); do { @@ -394,7 +393,7 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) } } while (!(iir & UART_IIR_NO_INT) && max_count--); - spin_unlock_irqrestore(&up->port.lock, flags); + spin_unlock(&up->port.lock); tty_flip_buffer_push(tty);