From: Ian Abbott Date: Fri, 4 Jan 2013 11:33:22 +0000 (+0000) Subject: staging: comedi: comedi_test: remove unnecessary del_timer() call X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=594dc67c239afd2f33b40c826bba887b38adf270;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: comedi_test: remove unnecessary del_timer() call In the "comedi_test" module, the timer function `waveform_ai_interrupt()` doesn't need to remove the timer from the timer queue as the caller has already removed it from the queue. Remove the call to `del_timer()` in this function. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c index 01de996239f1..c401f67d5878 100644 --- a/drivers/staging/comedi/drivers/comedi_test.c +++ b/drivers/staging/comedi/drivers/comedi_test.c @@ -218,8 +218,6 @@ static void waveform_ai_interrupt(unsigned long arg) if ((async->events & COMEDI_CB_EOA) == 0 && devpriv->timer_running) mod_timer(&devpriv->timer, jiffies + 1); - else - del_timer(&devpriv->timer); comedi_event(dev, dev->read_subdev); }