From: Peter Hurley <peter@hurleysoftware.com>
Date: Mon, 11 Mar 2013 20:44:44 +0000 (-0400)
Subject: tty: Remove redundant tty_wait_until_sent()
X-Git-Tag: v3.10-rc1~191^2~52
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=be3971166d93a401105952672dab2eac6542cb57;p=~emulex%2Finfiniband.git

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>
---

diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 4e46c1721b9..1afe192bef6 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);
 
 	/*