From efc915669ca53c792d6cee949d4faef331a3980a Mon Sep 17 00:00:00 2001 From: Konstantin Khlebnikov Date: Fri, 14 Dec 2012 01:02:36 +0000 Subject: [PATCH] --- yaml --- r: 347291 b: refs/heads/master c: 4a0ae7b0a9e55db9b85f8abda623f145311eb951 h: refs/heads/master i: 347289: 614c13956a1786d40e3f161dce654779db2142d8 347287: 517b1de9ddab8ecec74726897b18d7af3e4e7405 v: v3 --- [refs] | 2 +- trunk/drivers/isdn/mISDN/dsp_core.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c05bcfcdcd8e..2666fb8ffad5 100644 --- 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 index 28c99c623bcd..22b720ec80cb 100644 --- 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 "