Re: [PATCH] ip2: avoid add_timer() with pending timer

[Andrew Morton]

On Mon, 14 Jul 2008 11:49:55 +0900 Akinobu Mita <akinobu.mita@xxxxxxxxx> wrote:

> @@ -746,10 +742,8 @@ ip2_loadmain(int *iop, int *irqp)
>  			}
>  			if ( ip2config.irq[i] == CIR_POLL ) {
>  retry:
> -				if (!TimerOn) {
> -					PollTimer.expires = POLL_TIMEOUT;
> -					add_timer ( &PollTimer );
> -					TimerOn = 1;
> +				if (!timer_pending(&PollTimer)) {
> +					mod_timer(&PollTimer, POLL_TIMEOUT);
>  					printk( KERN_INFO "IP2: polling\n");

This change to ip2_loadmain() might be racy if it actually did
anything.  But afaict timer_pending() can never be true here (we're
only called from module_init()) so it can and should be removed.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/