diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2014-12-30 13:11:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-09 23:17:59 +0100 |
| commit | eef15e2a54fad4c2ce3f0a81485dc591ce678f4f (patch) | |
| tree | 29144b22180fdc75cf0c62a3c6bdd9e1f3f0df6d | |
| parent | tty: serial: 8250: drop owner assignment from platform_drivers (diff) | |
| download | linux-eef15e2a54fad4c2ce3f0a81485dc591ce678f4f.tar.xz linux-eef15e2a54fad4c2ce3f0a81485dc591ce678f4f.zip | |
tty: Remove warning in tty_lock_slave()
Commit 2aff5e2bc62db43e05c814461a08aff0fc2b7fe5 ('tty: Change
tty lock order to master->slave') added a warning which is broken
and unnecessary now that the tty lock has fixed lock subclasses,
added in commit 2febdb632bb96235b94b8fccaf882a78f8f4b2bb
('tty: Preset lock subclass for nested tty locks').
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/tty_mutex.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/tty/tty_mutex.c b/drivers/tty/tty_mutex.c index 4486741190c4..a872389dc0bc 100644 --- a/drivers/tty/tty_mutex.c +++ b/drivers/tty/tty_mutex.c @@ -46,12 +46,8 @@ EXPORT_SYMBOL(tty_unlock); void __lockfunc tty_lock_slave(struct tty_struct *tty) { - if (tty && tty != tty->link) { - WARN_ON(!mutex_is_locked(&tty->link->legacy_mutex) || - !tty->driver->type == TTY_DRIVER_TYPE_PTY || - !tty->driver->type == PTY_TYPE_SLAVE); + if (tty && tty != tty->link) tty_lock(tty); - } } void __lockfunc tty_unlock_slave(struct tty_struct *tty) |