diff options
author | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
---|---|---|
committer | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
commit | 1212906351c3f4f5f759396c32b5e1dbabd403a4 (patch) | |
tree | 285c7eea05e3b246fe9560fae93d9d79dd5f2ad0 /channels/chan_skinny.c | |
parent | fc70db3a810dae81e0ba0e09ecf11468bbef4d54 (diff) |
Reverting r403311. It's causing ARI tests to hang.
........
Merged revisions 403398 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_skinny.c')
-rw-r--r-- | channels/chan_skinny.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 191c3cc24..a65862ff3 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -4845,7 +4845,6 @@ static void *skinny_newcall(void *data) struct skinny_device *d = l->device; int res = 0; - ast_channel_lock(c); ast_set_callerid(c, l->hidecallerid ? "" : l->cid_num, l->hidecallerid ? "" : l->cid_name, @@ -4859,7 +4858,6 @@ static void *skinny_newcall(void *data) ast_party_name_init(&ast_channel_connected(c)->id.name); #endif ast_setstate(c, AST_STATE_RING); - ast_channel_unlock(c); if (!sub->rtp) { start_rtp(sub); } @@ -5426,7 +5424,6 @@ static struct ast_channel *skinny_new(struct skinny_line *l, struct skinny_subli AST_LIST_INSERT_HEAD(&l->sub, sub, list); //l->activesub = sub; } - ast_channel_lock(tmp); ast_channel_stage_snapshot(tmp); ast_channel_tech_set(tmp, &skinny_tech); ast_channel_tech_pvt_set(tmp, sub); @@ -5502,7 +5499,6 @@ static struct ast_channel *skinny_new(struct skinny_line *l, struct skinny_subli pbx_builtin_setvar_helper(tmp, v->name, v->value); ast_channel_stage_snapshot_done(tmp); - ast_channel_unlock(tmp); if (state != AST_STATE_DOWN) { if (ast_pbx_start(tmp)) { |