summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2013-01-04 11:33:22 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-07 22:37:12 (GMT)
commit594dc67c239afd2f33b40c826bba887b38adf270 (patch)
tree2d3890f00f0d984c537f32e4a3c84e85d5ec22d8 /drivers/staging
parent0653bed67922d757a750adcb16edf8f56e4abcde (diff)
downloadlinux-fsl-qoriq-594dc67c239afd2f33b40c826bba887b38adf270.tar.xz
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 <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/comedi_test.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c
index 01de996..c401f67 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);
}