Skip to content

Commit

Permalink
[PATCH] Char: istallion, use mod_timer
Browse files Browse the repository at this point in the history
Do not set expires by hand, use kernel helper, which also calls add_timer.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent ec3dde5 commit ff8efe9
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/char/istallion.c
Original file line number Diff line number Diff line change
Expand Up @@ -2545,8 +2545,7 @@ static void stli_poll(unsigned long arg)
struct stlibrd *brdp;
unsigned int brdnr;

stli_timerlist.expires = STLI_TIMEOUT;
add_timer(&stli_timerlist);
mod_timer(&stli_timerlist, STLI_TIMEOUT);

/*
* Check each board and do any servicing required.
Expand Down Expand Up @@ -3610,8 +3609,7 @@ static int stli_startbrd(struct stlibrd *brdp)

if (! stli_timeron) {
stli_timeron++;
stli_timerlist.expires = STLI_TIMEOUT;
add_timer(&stli_timerlist);
mod_timer(&stli_timerlist, STLI_TIMEOUT);
}

return rc;
Expand Down

0 comments on commit ff8efe9

Please sign in to comment.