diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-25 22:11:06 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-25 22:11:06 -0400 |
| commit | 8a75e7d644b373f86c8c2316392cb7374fc4e063 (patch) | |
| tree | c2beb29f8e4f5c1ea246d792693f8af4f7f03fef /drivers/s390/net/ctctty.c | |
| parent | f5a702b26a0cd6052f0bae2bc3f0548538d3909c (diff) | |
| parent | 05e08a2a297371564020f76d1bf8b3a931d5e1ed (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch qeth
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 9257d60c783..3080393e823 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); |