---

yaml --- r: 347291 b: refs/heads/master c: 4a0ae7b h: refs/heads/master i: 347289: 614c139 347287: 517b1de v: v3
git-mirror · Dec 14, 2012 · efc9156 · efc9156
1 parent a117716
commit efc9156
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4008e97f866db66511f065ae9052e0733a3a8429
+refs/heads/master: 4a0ae7b0a9e55db9b85f8abda623f145311eb951
diff --git a/trunk/drivers/isdn/mISDN/dsp_core.c b/trunk/drivers/isdn/mISDN/dsp_core.c
@@ -1217,8 +1217,7 @@ static void __exit dsp_cleanup(void)
 {
 	mISDN_unregister_Bprotocol(&DSP);
 
-	if (timer_pending(&dsp_spl_tl))
-		del_timer(&dsp_spl_tl);
+	del_timer_sync(&dsp_spl_tl);
 
 	if (!list_empty(&dsp_ilist)) {
 		printk(KERN_ERR "mISDN_dsp: Audio DSP object inst list not "