From e7c5c75d706c93678a5013b9a9489c6d00d1efc8 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 4 Jan 2013 11:33:22 +0000 Subject: [PATCH] --- yaml --- r: 353952 b: refs/heads/master c: 594dc67c239afd2f33b40c826bba887b38adf270 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/comedi_test.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 94720fe6320e..d16b6a3a3653 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0653bed67922d757a750adcb16edf8f56e4abcde +refs/heads/master: 594dc67c239afd2f33b40c826bba887b38adf270 diff --git a/trunk/drivers/staging/comedi/drivers/comedi_test.c b/trunk/drivers/staging/comedi/drivers/comedi_test.c index 01de996239f1..c401f67d5878 100644 --- a/trunk/drivers/staging/comedi/drivers/comedi_test.c +++ b/trunk/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); }