---

yaml --- r: 374987 b: refs/heads/master c: efefbcc h: refs/heads/master i: 374985: ca77f46 374983: d6705bd v: v3
git-mirror · May 9, 2013 · 7144aaf · 7144aaf
1 parent 6fa08f8
commit 7144aaf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 }