diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 17:27:39 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 17:27:39 (GMT) |
| commit | f49809fe9b39e22b0f6f75c86295ce216ce3e374 (patch) | |
| tree | 05f8c05ee71307c9ab02663cfaa5f08a21c6629f /drivers/s390/net/ctctty.c | |
| parent | cdbbde14cb55dd10771ce79154f787322d88411b (diff) | |
| parent | c1ef1f351db70ad60c793b8218dd9f6739cfd66d (diff) | |
| download | linux-f49809fe9b39e22b0f6f75c86295ce216ce3e374.tar.xz | |
Automatic merge of 'for-linus' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/s390/net/ctctty.c')
| -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 9257d60..3080393 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); |