From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Hurley Subject: [PATCH v4 24/32] tty: Remove redundant tty_wait_until_sent() Date: Wed, 20 Feb 2013 15:03:11 -0500 Message-ID: <1361390599-15195-25-git-send-email-peter@hurleysoftware.com> References: <1361390599-15195-1-git-send-email-peter@hurleysoftware.com> Return-path: In-Reply-To: <1361390599-15195-1-git-send-email-peter@hurleysoftware.com> In-Reply-To: <1360095638-6624-1-git-send-email-peter@hurleysoftware.com> References: <1360095638-6624-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org To: Greg Kroah-Hartman , Jiri Slaby Cc: Sasha Levin , Sebastian Andrzej Siewior , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Ilya Zykov , Dave Jones , Michael Ellerman , Shawn Guo , Peter Hurley List-Id: linux-serial@vger.kernel.org tty_ioctl() already waits until sent. Signed-off-by: Peter Hurley --- drivers/tty/tty_ldisc.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c index 4e46c17..1afe192 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); /* -- 1.8.1.2