summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorMatthew Fredrickson <creslin@digium.com>2008-04-12 16:21:29 +0000
committerMatthew Fredrickson <creslin@digium.com>2008-04-12 16:21:29 +0000
commit5110d3bc69e63fe34f9efd6711ec7dad578d2ee2 (patch)
tree40b334a3c5cb4c4b3c1abd65fcdc60cc268c22eb /channels
parentf9960bc748c1c334481cfab48d5753fd26c7d682 (diff)
Make sure linkset is locked exiting ss7_start_call
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_zap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 84d4b96a3..54659903f 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -9140,6 +9140,7 @@ static void ss7_start_call(struct zt_pvt *p, struct zt_ss7 *linkset)
ast_mutex_unlock(&linkset->lock);
c = zt_new(p, AST_STATE_RING, 1, SUB_REAL, law, 0);
+ ast_mutex_lock(&linkset->lock);
if (!c) {
ast_log(LOG_WARNING, "Unable to start PBX on CIC %d\n", p->cic);
@@ -9147,8 +9148,6 @@ static void ss7_start_call(struct zt_pvt *p, struct zt_ss7 *linkset)
} else
ast_verb(3, "Accepting call to '%s' on CIC %d\n", p->exten, p->cic);
- ast_mutex_lock(&linkset->lock);
-
zt_enable_ec(p);
if (!ast_strlen_zero(p->charge_number)) {