diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /drivers/telephony | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'drivers/telephony')
| -rw-r--r-- | drivers/telephony/ixj.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index 584b3615c..a3be533e6 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c @@ -1812,6 +1812,8 @@ ssize_t ixj_read(struct file * file_p, char *buf, size_t length, loff_t * ppos) while (!j->read_buffer_ready || (j->dtmf_state && j->flags.dtmf_oob)) { ++j->read_wait; if(j->tone_state) { + set_current_state(TASK_RUNNING); + remove_wait_queue(&j->read_q, &wait); j->flags.inread = 0; return -EAGAIN; } @@ -1894,6 +1896,8 @@ ssize_t ixj_write(struct file *file_p, const char *buf, size_t count, loff_t * p while (!j->write_buffers_empty) { ++j->write_wait; if(j->tone_state) { + set_current_state(TASK_RUNNING); + remove_wait_queue(&j->write_q, &wait); j->flags.inwrite = 0; return -EAGAIN; } |