diff --git a/[refs] b/[refs] index 796ab9f3fbe6..bdfcb32d1ca5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc575ee6eadbcac757e3216e230b6fab1ba5b140 +refs/heads/master: 8842dda2366d3d0c97646102768831f9b0ffd712 diff --git a/trunk/drivers/tty/tty_io.c b/trunk/drivers/tty/tty_io.c index f6ce2c5fbe5b..6afca98fae21 100644 --- a/trunk/drivers/tty/tty_io.c +++ b/trunk/drivers/tty/tty_io.c @@ -1391,9 +1391,7 @@ static int tty_reopen(struct tty_struct *tty) } tty->count++; - mutex_lock(&tty->ldisc_mutex); WARN_ON(!test_bit(TTY_LDISC, &tty->flags)); - mutex_unlock(&tty->ldisc_mutex); return 0; }