[svn-commits] sruffell: linux/trunk r10625 - /linux/trunk/drivers/dahdi/dahdi_dynamic.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Apr  3 14:44:37 2012
New Revision: 10625

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10625
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>

Modified:
    linux/trunk/drivers/dahdi/dahdi_dynamic.c

Modified: linux/trunk/drivers/dahdi/dahdi_dynamic.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_dynamic.c?view=diff&rev=10625&r1=10624&r2=10625
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_dynamic.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_dynamic.c Tue Apr  3 14:44:37 2012
@@ -857,6 +857,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");
 }