diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2013-03-11 16:44:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 19:48:42 -0400 |
commit | be3971166d93a401105952672dab2eac6542cb57 (patch) | |
tree | a8180900d71b0f69906c01ae021ec39b059a8e1e | |
parent | 734de249fbe2fbf594c30202a343f0772b6d18fe (diff) |
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>
-rw-r--r-- | drivers/tty/tty_ldisc.c | 9 |
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) | |||
625 | return 0; | 625 | return 0; |
626 | } | 626 | } |
627 | 627 | ||
628 | tty_unlock(tty); | ||
629 | /* | ||
630 | * Problem: What do we do if this blocks ? | ||
631 | * We could deadlock here | ||
632 | */ | ||
633 | |||
634 | tty_wait_until_sent(tty, 0); | ||
635 | |||
636 | tty_lock(tty); | ||
637 | mutex_lock(&tty->ldisc_mutex); | 628 | mutex_lock(&tty->ldisc_mutex); |
638 | 629 | ||
639 | /* | 630 | /* |