diff --git a/[refs] b/[refs] index 97ef8060a031..f6cc97e54d43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec3dde578a969ea4b0a8c3d45e02d73abab1b2d3 +refs/heads/master: ff8efe978d18e2479f998c4722c1eaafd7cd2dd9 diff --git a/trunk/drivers/char/istallion.c b/trunk/drivers/char/istallion.c index f1752c81993b..68645d351873 100644 --- a/trunk/drivers/char/istallion.c +++ b/trunk/drivers/char/istallion.c @@ -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. @@ -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;