diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-06-15 17:33:20 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-06-15 17:33:20 -0500 |
| commit | 86e732880f30977872ce23b9339fee8630f5f7cc (patch) | |
| tree | 192f081c57a6861e0c4b031091c8727c58c486ef /drivers/serial/omap-serial.c | |
| parent | 6a1de81ebcf75e9eb77bc42e1593797c722a38a1 (diff) | |
| parent | c05c4a28af828fc46fbcbde72920ec405433b56d (diff) | |
Merge branch 'omap4_next' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24.7ti-2.6.34-omap4-L24.7-p1
Diffstat (limited to 'drivers/serial/omap-serial.c')
| -rw-r--r-- | drivers/serial/omap-serial.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/serial/omap-serial.c b/drivers/serial/omap-serial.c index b40a9118e750..d69a5edb6105 100644 --- a/drivers/serial/omap-serial.c +++ b/drivers/serial/omap-serial.c @@ -353,7 +353,7 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) spin_lock_irqsave(&up->port.lock, flags); lsr = serial_in(up, UART_LSR); - if (iir & UART_IER_RLSI) { + if (iir & UART_IIR_RLSI) { if (!up->use_dma) { if (lsr & UART_LSR_DR) receive_chars(up, &lsr); @@ -917,6 +917,7 @@ serial_omap_console_write(struct console *co, const char *s, struct uart_omap_port *up = serial_omap_console_ports[co->index]; unsigned int ier; + spin_lock(&up->port.lock); /* * First save the IER then disable the interrupts */ @@ -940,6 +941,8 @@ serial_omap_console_write(struct console *co, const char *s, */ if (up->msr_saved_flags) check_modem_status(up); + + spin_unlock(&up->port.lock); } static int __init |