diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index b28d6356a142c3e47dd96352d37409c9523d87fd..2d66beed3e1fd1985682cb84658d1481c94947d8 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -1633,6 +1633,7 @@ int tty_release(struct inode *inode, struct file *filp) int devpts; int idx; char buf[64]; + long timeout = 0; if (tty_paranoia_check(tty, inode, __func__)) return 0; @@ -1717,7 +1718,11 @@ int tty_release(struct inode *inode, struct file *filp) __func__, tty_name(tty, buf)); tty_unlock(); mutex_unlock(&tty_mutex); - schedule(); + schedule_timeout_killable(timeout); + if (timeout < 120 * HZ) + timeout = 2 * timeout + 1; + else + timeout = MAX_SCHEDULE_TIMEOUT; } /*