aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2013-03-11 16:44:44 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-18 16:48:42 -0700
commitbe3971166d93a401105952672dab2eac6542cb57 (patch)
treea8180900d71b0f69906c01ae021ec39b059a8e1e /drivers
parenttty: Locate get/put ldisc functions together (diff)
downloadlinux-dev-be3971166d93a401105952672dab2eac6542cb57.tar.xz
linux-dev-be3971166d93a401105952672dab2eac6542cb57.zip
tty: Remove redundant tty_wait_until_sent()
tty_ioctl() already waits until sent. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/tty_ldisc.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 4e46c1721b9d..1afe192bef6a 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -625,15 +625,6 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
return 0;
}
- tty_unlock(tty);
- /*
- * Problem: What do we do if this blocks ?
- * We could deadlock here
- */
-
- tty_wait_until_sent(tty, 0);
-
- tty_lock(tty);
mutex_lock(&tty->ldisc_mutex);
/*