[zaptel-commits] tzafrir: branch 1.4 r2992 - /branches/1.4/zaptel-base.c

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Tue Sep  4 11:16:26 2007
New Revision: 2992

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2992
Log:
Fixing the ZAPTEL_SYNC_TICK patch for zaptel-base.c (#9645)

Modified:
    branches/1.4/zaptel-base.c

Modified: branches/1.4/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/zaptel-base.c?view=diff&rev=2992&r1=2991&r2=2992
==============================================================================
--- branches/1.4/zaptel-base.c (original)
+++ branches/1.4/zaptel-base.c Tue Sep  4 11:16:26 2007
@@ -6805,10 +6805,6 @@
 	int x,y,z;
 	unsigned long flags;
 
-#ifdef	ZAPTEL_SYNC_TICK
-	if (span->sync_tick)
-		span->sync_tick(span, span == master);
-#endif
 #if 1
 	for (x=0;x<span->channels;x++) {
 		spin_lock_irqsave(&span->chans[x].lock, flags);
@@ -7025,6 +7021,14 @@
 				spin_unlock_irqrestore(&chans[x]->lock, flags);
 			}
 		}
+#ifdef	ZAPTEL_SYNC_TICK
+		for (x=0;x<maxspans;x++) {
+			struct zt_span	*s = spans[x];
+
+			if (s && s->sync_tick)
+				s->sync_tick(s, s == master);
+		}
+#endif
 		spin_unlock_irqrestore(&bigzaplock, flagso);			
 	}
 #endif