diff options
author | Frank Pavlic <pavlic@de.ibm.com> | 2005-05-12 14:36:22 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-15 18:06:16 -0400 |
commit | 7f81947b46c3efacc084ac5033f3fed702e46532 (patch) | |
tree | 8b611dc8dc406f26ed226792f0353fa4e4fc24d8 | |
parent | b5f9d55b64a5c7193f8965c90ba62244ea3180b2 (diff) |
[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>
-rw-r--r-- | drivers/s390/net/ctctty.c | 5 |
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 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: ctctty.c,v 1.26 2004/08/04 11:06:55 mschwide Exp $ | 2 | * $Id: ctctty.c,v 1.29 2005/04/05 08:50:44 mschwide Exp $ |
3 | * | 3 | * |
4 | * CTC / ESCON network driver, tty interface. | 4 | * CTC / ESCON network driver, tty interface. |
5 | * | 5 | * |
@@ -1056,8 +1056,7 @@ ctc_tty_close(struct tty_struct *tty, struct file *filp) | |||
1056 | info->tty = 0; | 1056 | info->tty = 0; |
1057 | tty->closing = 0; | 1057 | tty->closing = 0; |
1058 | if (info->blocked_open) { | 1058 | if (info->blocked_open) { |
1059 | set_current_state(TASK_INTERRUPTIBLE); | 1059 | msleep_interruptible(500); |
1060 | schedule_timeout(HZ/2); | ||
1061 | wake_up_interruptible(&info->open_wait); | 1060 | wake_up_interruptible(&info->open_wait); |
1062 | } | 1061 | } |
1063 | info->flags &= ~(CTC_ASYNC_NORMAL_ACTIVE | CTC_ASYNC_CLOSING); | 1062 | info->flags &= ~(CTC_ASYNC_NORMAL_ACTIVE | CTC_ASYNC_CLOSING); |