From cfd76ce2a40fe6bb21aa8079cdc092eb6e3320e8 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 4 Jan 2013 11:33:21 +0000
Subject: [PATCH] --- yaml --- r: 353951 b: refs/heads/master c:
 0653bed67922d757a750adcb16edf8f56e4abcde h: refs/heads/master i:   353949:
 938b8551808cb33816cd684d23ee64e887dd7105   353947:
 80ff3f33dbe0f4d6f68053a1b1e188c702c3861e   353943:
 0858e0bace4be228539fea62a980112c5864a3ab   353935:
 8d98c9f4cfe4cbc5424476983aabebdef5a68f2b   353919:
 1d28a6fae4a26538f33a1849fea9678545d81537 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 a73e69a5bfe9..94720fe6320e 100644
--- 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
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;
 }