5 files changed, 6 insertions, 5 deletions

diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index d8504279e502..e5546cb3ac69 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1693,7 +1693,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
          * line status register.
          */
         if (info->flags & ISDN_ASYNC_INITIALIZED) {
-                tty_wait_until_sent(tty, 3000); /* 30 seconds timeout */
+                tty_wait_until_sent_from_close(tty, 3000);      /* 30 seconds timeout */
                 /*
                  * Before we drop DTR, make sure the UART transmitter
                  * has completely drained; this is especially
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index e1aaf4f309b3..b6b2d18fa38d 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -388,7 +388,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
                  * there is no buffered data otherwise sleeps on a wait queue
                  * waking periodically to check chars_in_buffer().
                  */
-                tty_wait_until_sent(tty, HVC_CLOSE_WAIT);
+                tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
         } else {
                 if (hp->count < 0)
                         printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index 4c8b66546930..e523773a5480 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -1237,7 +1237,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
                 irq = hvcsd->vdev->irq;
                 spin_unlock_irqrestore(&hvcsd->lock, flags);
 
-                tty_wait_until_sent(tty, HVCS_CLOSE_WAIT);
+                tty_wait_until_sent_from_close(tty, HVCS_CLOSE_WAIT);
 
                 /*
                  * This line is important because it tells hvcs_open that this
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 0464360781fe..1d3780cc3b70 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1292,7 +1292,8 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
         spin_unlock_irqrestore(&port->lock, flags);
 
         if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, msecs_to_jiffies(port->closing_wait));
+                tty_wait_until_sent_from_close(tty,
+                                msecs_to_jiffies(port->closing_wait));
 
         /*
          * At this point, we stop accepting input.  To do this, we
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index b3cc8b3989a9..253695d43fd9 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -551,7 +551,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
          */
         tty->closing = 1;
         if (self->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, self->closing_wait);
+                tty_wait_until_sent_from_close(tty, self->closing_wait);
 
         ircomm_tty_shutdown(self);