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 /addons | |
| 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 'addons')
| -rw-r--r-- | addons/chan_mobile.c | 2 | ||||
| -rw-r--r-- | addons/chan_ooh323.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c index c9e56b854..2cf7c7dbd 100644 --- a/addons/chan_mobile.c +++ b/addons/chan_mobile.c @@ -861,7 +861,6 @@ static struct ast_channel *mbl_new(int state, struct mbl_pvt *pvt, char *cid_num goto e_return; } - ast_channel_lock(chn); ast_channel_tech_set(chn, &mbl_tech); ast_format_cap_add(ast_channel_nativeformats(chn), &prefformat); ast_format_copy(ast_channel_rawreadformat(chn), &prefformat); @@ -879,7 +878,6 @@ static struct ast_channel *mbl_new(int state, struct mbl_pvt *pvt, char *cid_num if (pvt->sco_socket != -1) { ast_channel_set_fd(chn, 0, pvt->sco_socket); } - ast_channel_unlock(chn); return chn; diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index deec21fa7..56a1b7b68 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -2153,8 +2153,8 @@ int onCallEstablished(ooCallData *call) } ast_queue_control(c, AST_CONTROL_ANSWER); + ast_channel_unlock(p->owner); ast_publish_channel_state(c); - ast_channel_unlock(p->owner); } ast_mutex_unlock(&p->lock); |