diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/char/dtlk.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/char/dtlk.c')
| -rw-r--r-- | drivers/char/dtlk.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c index bd832b9b1..542ad99bf 100644 --- a/drivers/char/dtlk.c +++ b/drivers/char/dtlk.c @@ -241,6 +241,8 @@ static ssize_t dtlk_write(struct file *file, const char *buf, static unsigned int dtlk_poll(struct file *file, poll_table * wait) { int mask = 0; + unsigned long expires; + TRACE_TEXT(" dtlk_poll"); /* static long int j; @@ -261,9 +263,8 @@ static unsigned int dtlk_poll(struct file *file, poll_table * wait) /* there are no exception conditions */ /* There won't be any interrupts, so we set a timer instead. */ - del_timer(&dtlk_timer); - dtlk_timer.expires = jiffies + 3*HZ / 100; - add_timer(&dtlk_timer); + expires = jiffies + 3*HZ / 100; + mod_timer(&dtlk_timer, expires); return mask; } |