diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-09-18 16:10:48 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-09-18 16:10:48 +0000 |
| commit | 96f4079dacffdfd911331e36a68fd814f7a72004 (patch) | |
| tree | eba57379716a47f3aced7de28663c82ae79e7a20 /channels/chan_zap.c | |
| parent | a9c2f441d37903aba91d6f7d26d62b35a41875ad (diff) | |
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.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 262532c94..e770db2d1 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3474,7 +3474,8 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann 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 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann /* 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; |