[svn-commits] sruffell: branch linux/2.6 r10630 - /linux/branches/2.6/drivers/dahdi/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Apr  3 15:10:12 2012
New Revision: 10630

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10630
Log:
dahdi_dynamic: Close race on unload if red alarm timer was running when unloaded.

I saw a kernel oops that was the result of the timer running after the
dahdi_dynamic module was unloaded. Now we wait for the timer to complete, and
then delete it again in case it reactivated itself.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10625

Modified:
    linux/branches/2.6/drivers/dahdi/dahdi_dynamic.c

Modified: linux/branches/2.6/drivers/dahdi/dahdi_dynamic.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.6/drivers/dahdi/dahdi_dynamic.c?view=diff&rev=10630&r1=10629&r2=10630
==============================================================================
--- linux/branches/2.6/drivers/dahdi/dahdi_dynamic.c (original)
+++ linux/branches/2.6/drivers/dahdi/dahdi_dynamic.c Tue Apr  3 15:10:12 2012
@@ -862,6 +862,9 @@
 		tasklet_kill(&dahdi_dynamic_tlet);
 	}
 #endif
+	del_timer_sync(&alarmcheck);
+	/* Must call again in case it was running before and rescheduled
+	 * itself. */
 	del_timer(&alarmcheck);
 	printk(KERN_INFO "DAHDI Dynamic Span support unloaded\n");
 }