[dahdi-commits] rmeyerriecks: linux/trunk r7110 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the DAHDI project]

Author: rmeyerriecks
Date: Mon Sep 14 15:30:24 2009
New Revision: 7110

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=7110
Log:
Fixed issue where the clear channel flags were not being set at the appropriate time causing a channel re-configure to mis-set the last channel in each span

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

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=7110&r1=7109&r2=7110
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Mon Sep 14 15:30:24 2009
@@ -4094,9 +4094,6 @@
 		if ((sigcap & ch.sigtype) != ch.sigtype)
 			res = -EINVAL;
 
-		if (!res && chans[ch.chan]->span->chanconfig)
-			res = chans[ch.chan]->span->chanconfig(chans[ch.chan], ch.sigtype);
-
 		if (chans[ch.chan]->master != chans[ch.chan]) {
 			struct dahdi_chan *oldmaster = chans[ch.chan]->master;
 
@@ -4167,6 +4164,12 @@
 			else
 				chans[ch.chan]->flags &= ~DAHDI_FLAG_MTP2;
 		}
+
+		if (!res && chans[ch.chan]->span->chanconfig){
+			res = chans[ch.chan]->span->chanconfig(chans[ch.chan],
+							       ch.sigtype);
+		}
+
 #ifdef CONFIG_DAHDI_NET
 		if (!res &&
 		    (newmaster == chans[ch.chan]) &&