diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-28 13:32:57 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-16 13:00:31 -0600 |
| commit | a2cf317dad0bc122063b43eac97cb4d12e62c2cc (patch) | |
| tree | c63ae3f9779df25a6a610dd58bca46d72a81743b | |
| parent | 57d8d7d5f02b88c0ebca459741dcb3aa7d73918b (diff) | |
drivers-tty-fix-omap-lock-crap.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 5e713d3ef1f4..93cdb92d1632 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -946,13 +946,12 @@ serial_omap_console_write(struct console *co, const char *s, unsigned int ier; int locked = 1; - local_irq_save(flags); if (up->port.sysrq) locked = 0; else if (oops_in_progress) - locked = spin_trylock(&up->port.lock); + locked = spin_trylock_irqsave(&up->port.lock, flags); else - spin_lock(&up->port.lock); + spin_lock_irqsave(&up->port.lock, flags); /* * First save the IER then disable the interrupts @@ -979,8 +978,7 @@ serial_omap_console_write(struct console *co, const char *s, check_modem_status(up); if (locked) - spin_unlock(&up->port.lock); - local_irq_restore(flags); + spin_unlock_irqrestore(&up->port.lock, flags); } static int __init |