[asterisk-commits] russell: trunk r82776 - /trunk/channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Sep 18 11:10:48 2007
New Revision: 82776

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82776
Log:
Don't use ast_channel_lock_both() here, it only exists in one of my branches.
This is theoretically a potential deadlock, but it's the way it was before so
I'm going to leave it this way for now.

Modified:
    trunk/channels/chan_zap.c

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