staging: comedi: comedi_test: remove unnecessary del_timer() call
authorIan Abbott <abbotti@mev.co.uk>
Fri, 4 Jan 2013 11:33:22 +0000 (11:33 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Jan 2013 22:37:12 +0000 (14:37 -0800)
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 <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/comedi_test.c

index 01de996239f1e6142f07f9851cc840e8ddc14a75..c401f67d58789a5a19758dd5dafc39cfac6ddb0c 100644 (file)
@@ -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);
 }