Commit ff8efe97 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

[PATCH] Char: istallion, use mod_timer 



Do not set expires by hand, use kernel helper, which also calls add_timer.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ec3dde57

drivers/char/istallion.c

+2 −4
Original line number Diff line number Diff line
@@ -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;