summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorFrank Pavlic <pavlic@de.ibm.com>2005-05-12 20:36:22 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-05-15 18:06:16 -0400
commit7f81947b46c3efacc084ac5033f3fed702e46532 (patch)
tree8b611dc8dc406f26ed226792f0353fa4e4fc24d8 /drivers/s390
parentb5f9d55b64a5c7193f8965c90ba62244ea3180b2 (diff)
downloadblackbird-op-linux-7f81947b46c3efacc084ac5033f3fed702e46532.tar.gz
blackbird-op-linux-7f81947b46c3efacc084ac5033f3fed702e46532.zip
[PATCH] s390: schedule_timeout cleanup in ctctty
[patch 4/10] s390: schedule_timeout cleanup in ctctty. From: Domen Puncer <domen@coderock.org> Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Frank Pavlic <pavlic@de.ibm.com> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/net/ctctty.c5
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);
OpenPOWER on IntegriCloud