From 7144aaf63e7ff18810a07473f09f9a1b2fadeac7 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Mon, 4 Feb 2013 23:38:13 +0400 Subject: [PATCH] --- yaml --- r: 374987 b: refs/heads/master c: efefbcc50028fb025316a1a21dca5ce4fd90e881 h: refs/heads/master i: 374985: ca77f46d1e5363295503aaeddb2e0a72e242fb9b 374983: d6705bded32e8dfaad562a24580a55a7fac2d4e8 v: v3 --- [refs] | 2 +- trunk/arch/xtensa/platforms/iss/console.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7b0140d15f72..f0009ba2871c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 895666a9920f19bc256340aaf58d01da6e677a16 +refs/heads/master: efefbcc50028fb025316a1a21dca5ce4fd90e881 diff --git a/trunk/arch/xtensa/platforms/iss/console.c b/trunk/arch/xtensa/platforms/iss/console.c index e8697218c65e..70cb408bc20d 100644 --- a/trunk/arch/xtensa/platforms/iss/console.c +++ b/trunk/arch/xtensa/platforms/iss/console.c @@ -56,13 +56,13 @@ static void rs_poll(unsigned long); static int rs_open(struct tty_struct *tty, struct file * filp) { tty->port = &serial_port; - spin_lock(&timer_lock); + spin_lock_bh(&timer_lock); if (tty->count == 1) { setup_timer(&serial_timer, rs_poll, (unsigned long)&serial_port); mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE); } - spin_unlock(&timer_lock); + spin_unlock_bh(&timer_lock); return 0; }