From 7df8c6ae69ec1a90724063aca64dee823c20d3a6 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 4 Jan 2013 11:33:21 +0000 Subject: [PATCH] --- yaml --- r: 348737 b: refs/heads/master c: c0729eeefdcd76db338f635162bf0739fd2c5f6f h: refs/heads/master i: 348735: bfcabaaa3bfb5d25c9ba0b9fbfd1d60c5a49428c v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/comedi_test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f6865277621f..f46c5f32b280 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34ffb33e09132401872fe79e95c30824ce194d23 +refs/heads/master: c0729eeefdcd76db338f635162bf0739fd2c5f6f diff --git a/trunk/drivers/staging/comedi/drivers/comedi_test.c b/trunk/drivers/staging/comedi/drivers/comedi_test.c index fb3d09323ba1..01de996239f1 100644 --- a/trunk/drivers/staging/comedi/drivers/comedi_test.c +++ b/trunk/drivers/staging/comedi/drivers/comedi_test.c @@ -345,7 +345,7 @@ static int waveform_ai_cancel(struct comedi_device *dev, struct waveform_private *devpriv = dev->private; devpriv->timer_running = 0; - del_timer(&devpriv->timer); + del_timer_sync(&devpriv->timer); return 0; }