[asterisk-commits] russell: branch russell/chan_refcount r82801 - /team/russell/chan_refcount/ch...

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Sep 18 11:17:29 2007
New Revision: 82801

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82801
Log:
automerge beat me to this change

Modified:
    team/russell/chan_refcount/channels/chan_zap.c

Modified: team/russell/chan_refcount/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_zap.c?view=diff&rev=82801&r1=82800&r2=82801
==============================================================================
--- team/russell/chan_refcount/channels/chan_zap.c (original)
+++ team/russell/chan_refcount/channels/chan_zap.c Tue Sep 18 11:17:29 2007
@@ -3474,8 +3474,7 @@
 	if (flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1))
 		return AST_BRIDGE_FAILED_NOWARN;
 
-	ast_channel_lock(c0);
-	ast_channel_lock(c1);
+	ast_channel_lock_both(c0, c1);
 
 	p0 = c0->tech_pvt;
 	p1 = c1->tech_pvt;
@@ -3641,8 +3640,7 @@
 
 		/* Here's our main loop...  Start by locking things, looking for private parts, 
 		   and then balking if anything is wrong */
-		ast_channel_lock(c0);
-		ast_channel_lock(c1);
+		ast_channel_lock_both(c0, c1);
 
 		p0 = c0->tech_pvt;
 		p1 = c1->tech_pvt;