Automatic merge of /spare/repo/linux-2.6/.git branch HEAD

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/s390/net/ctctty.c b/drivers/s390/net/ctctty.c
index 9257d60c7833..3080393e823d 100644
--- a/drivers/s390/net/ctctty.c
+++ b/drivers/s390/net/ctctty.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ctctty.c,v 1.26 2004/08/04 11:06:55 mschwide Exp $
+ * $Id: ctctty.c,v 1.29 2005/04/05 08:50:44 mschwide Exp $
  *
  * CTC / ESCON network driver, tty interface.
  *
@@ -1056,8 +1056,7 @@ ctc_tty_close(struct tty_struct *tty, struct file *filp)
         info->tty = 0;
         tty->closing = 0;
         if (info->blocked_open) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                schedule_timeout(HZ/2);
+                msleep_interruptible(500);
                 wake_up_interruptible(&info->open_wait);
         }
         info->flags &= ~(CTC_ASYNC_NORMAL_ACTIVE | CTC_ASYNC_CLOSING);