aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/platforms/iss/console.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/xtensa/platforms/iss/console.c')
-rw-r--r--arch/xtensa/platforms/iss/console.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 01842e4d1904..94ab8eca9d77 100644
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -91,11 +91,10 @@ static int rs_open(struct tty_struct *tty, struct file * filp)
91 */ 91 */
92static void rs_close(struct tty_struct *tty, struct file * filp) 92static void rs_close(struct tty_struct *tty, struct file * filp)
93{ 93{
94 spin_lock(&timer_lock); 94 spin_lock_bh(&timer_lock);
95 if (tty->count == 1) 95 if (tty->count == 1)
96 /* this will cause a deadlock if the timer ticks right now */
97 del_timer_sync(&serial_timer); 96 del_timer_sync(&serial_timer);
98 spin_unlock(&timer_lock); 97 spin_unlock_bh(&timer_lock);
99} 98}
100 99
101 100