From: Mark Spencer <markster@digium.com>
Date: Tue, 27 Jul 2004 00:53:09 +0000 (+0000)
Subject: Swap subs before releasing lock
X-Git-Tag: 1.0.0-rc2~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bd8cf6cdec548241f9d9158cc1c89c051197b03;p=thirdparty%2Fasterisk.git

Swap subs before releasing lock


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 087035329b..de3f67a741 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -2882,8 +2882,9 @@ static int attempt_transfer(struct zt_pvt *p)
 					p->subs[SUB_THREEWAY].owner->bridge->name, p->subs[SUB_REAL].owner->name);
 			return -1;
 		}
-		ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock);
+		/* Three-way is now the REAL */
 		swap_subs(p, SUB_THREEWAY, SUB_REAL);
+		ast_mutex_unlock(&p->subs[SUB_REAL].owner->lock);
 		unalloc_sub(p, SUB_THREEWAY);
 		/* Tell the caller not to hangup */
 		return 1;