diff options
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 0ceca4457d3b..99042b0fb941 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c | |||
| @@ -351,11 +351,10 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) | |||
| 351 | struct tty_struct *tty = up->port.state->port.tty; | 351 | struct tty_struct *tty = up->port.state->port.tty; |
| 352 | unsigned int iir, lsr; | 352 | unsigned int iir, lsr; |
| 353 | unsigned int type; | 353 | unsigned int type; |
| 354 | unsigned long flags; | ||
| 355 | irqreturn_t ret = IRQ_NONE; | 354 | irqreturn_t ret = IRQ_NONE; |
| 356 | int max_count = 256; | 355 | int max_count = 256; |
| 357 | 356 | ||
| 358 | spin_lock_irqsave(&up->port.lock, flags); | 357 | spin_lock(&up->port.lock); |
| 359 | pm_runtime_get_sync(up->dev); | 358 | pm_runtime_get_sync(up->dev); |
| 360 | 359 | ||
| 361 | do { | 360 | do { |
| @@ -394,7 +393,7 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) | |||
| 394 | } | 393 | } |
| 395 | } while (!(iir & UART_IIR_NO_INT) && max_count--); | 394 | } while (!(iir & UART_IIR_NO_INT) && max_count--); |
| 396 | 395 | ||
| 397 | spin_unlock_irqrestore(&up->port.lock, flags); | 396 | spin_unlock(&up->port.lock); |
| 398 | 397 | ||
| 399 | tty_flip_buffer_push(tty); | 398 | tty_flip_buffer_push(tty); |
| 400 | 399 | ||
