diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2007-07-15 23:40:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 09:05:44 -0700 |
| commit | 6defec139a0fb0fb36c41a441f8417360da81ea1 (patch) | |
| tree | 6da7c2b84a9d6978850e33f918e3ec6e3cac3003 /drivers/char/n_r3964.c | |
| parent | e0955e14f72dd1f561dc8b7c4434a253914ddfd4 (diff) | |
| download | kernel-common-6defec139a0fb0fb36c41a441f8417360da81ea1.tar.gz kernel-common-6defec139a0fb0fb36c41a441f8417360da81ea1.tar.bz2 kernel-common-6defec139a0fb0fb36c41a441f8417360da81ea1.zip | |
Char: n_r3964, use wait_event_interruptible
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/n_r3964.c')
| -rw-r--r-- | drivers/char/n_r3964.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c index 14557a4822c0..6b918b80f73e 100644 --- a/drivers/char/n_r3964.c +++ b/drivers/char/n_r3964.c @@ -1071,8 +1071,6 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file, struct r3964_client_info *pClient; struct r3964_message *pMsg; struct r3964_client_message theMsg; - DECLARE_WAITQUEUE(wait, current); - int count; TRACE_L("read()"); @@ -1086,16 +1084,8 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file, return -EAGAIN; } /* block until there is a message: */ - add_wait_queue(&pInfo->read_wait, &wait); -repeat: - __set_current_state(TASK_INTERRUPTIBLE); - pMsg = remove_msg(pInfo, pClient); - if (!pMsg && !signal_pending(current)) { - schedule(); - goto repeat; - } - __set_current_state(TASK_RUNNING); - remove_wait_queue(&pInfo->read_wait, &wait); + wait_event_interruptible(pInfo->read_wait, + (pMsg = remove_msg(pInfo, pClient))); } /* If we still haven't got a message, we must have been signalled */ |