From 24ef4386cb1de07968c54f6495d34925045202a9 Mon Sep 17 00:00:00 2001
From: Frank Pavlic <pavlic@de.ibm.com>
Date: Thu, 12 May 2005 20:36:22 +0200
Subject: [PATCH] --- yaml --- r: 1426 b: refs/heads/master c:
 7f81947b46c3efacc084ac5033f3fed702e46532 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/s390/net/ctctty.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 311148113e91..331b687bc9ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5f9d55b64a5c7193f8965c90ba62244ea3180b2
+refs/heads/master: 7f81947b46c3efacc084ac5033f3fed702e46532
diff --git a/trunk/drivers/s390/net/ctctty.c b/trunk/drivers/s390/net/ctctty.c
index 9257d60c7833..3080393e823d 100644
--- a/trunk/drivers/s390/net/ctctty.c
+++ b/trunk/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);