[svn-commits] sruffell: linux/trunk r5186 - /linux/trunk/drivers/dahdi/wcb4xxp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Oct 31 12:11:02 2008
New Revision: 5186

URL: http://svn.digium.com/view/dahdi?view=rev&rev=5186
Log:
Fix for a case where a span might not always come back up after a disconnect.

Patch provided by akohlsmith.
Issue: DAHDI-174

Modified:
    linux/trunk/drivers/dahdi/wcb4xxp/base.c

Modified: linux/trunk/drivers/dahdi/wcb4xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=5186&r1=5185&r2=5186
==============================================================================
--- linux/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcb4xxp/base.c Fri Oct 31 12:11:02 2008
@@ -1130,6 +1130,10 @@
  * T2 is not actually used in the driver, it is handled by the HFC-4S internally.
  * T3 is used by the TE state machine; it is the maximum time the TE side should wait for the INFO4 (activated) signal.
  */
+
+/* First, disable the expired timer; hfc_force_st_state() may activate it again. */
+	s->hfc_timer_on[t_no] = 0;
+
 	switch(t_no) {
 	case HFC_T1:					/* switch to G4 (pending deact.), resume auto mode */
 		hfc_force_st_state(b4, s->port, 4, 1);
@@ -1144,9 +1148,6 @@
 		if(printk_ratelimit())
 			dev_warn(b4->dev, "hfc_timer_expire found an unknown expired timer (%d)??\n", t_no);
 	}
-
-/* disable the expired timer */
-	s->hfc_timer_on[t_no] = 0;
 }
 
 /*