---

yaml --- r: 353951 b: refs/heads/master c: 0653bed h: refs/heads/master i: 353949: 938b855 353947: 80ff3f3 353943: 0858e0b 353935: 8d98c9f 353919: 1d28a6f v: v3
git-mirror · Jan 7, 2013 · cfd76ce · cfd76ce
1 parent b06359e
commit cfd76ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21f181f16cea4a4cbaea25409ddb044a4ad5cd34
+refs/heads/master: 0653bed67922d757a750adcb16edf8f56e4abcde
diff --git 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;
 }