Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43737
b: refs/heads/master
c: ff8efe9
h: refs/heads/master
i:
  43735: e7cb86d
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent df8223c commit bdafa03
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ec3dde578a969ea4b0a8c3d45e02d73abab1b2d3
refs/heads/master: ff8efe978d18e2479f998c4722c1eaafd7cd2dd9
6 changes: 2 additions & 4 deletions trunk/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 bdafa03

Please sign in to comment.