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_nbs.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_nbs.c')
-rw-r--r-- | channels/chan_nbs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index 41f696207..1d8c59d4e 100644 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -223,7 +223,6 @@ static struct ast_channel *nbs_new(struct nbs_pvt *i, int state, const char *lin struct ast_channel *tmp; tmp = ast_channel_alloc(1, state, 0, 0, "", "s", context, linkedid, 0, "NBS/%s", i->stream); if (tmp) { - ast_channel_lock(tmp); ast_channel_tech_set(tmp, &nbs_tech); ast_channel_set_fd(tmp, 0, nbs_fd(i->nbs)); @@ -240,7 +239,6 @@ static struct ast_channel *nbs_new(struct nbs_pvt *i, int state, const char *lin ast_channel_language_set(tmp, ""); i->owner = tmp; i->u = ast_module_user_add(tmp); - ast_channel_unlock(tmp); if (state != AST_STATE_DOWN) { if (ast_pbx_start(tmp)) { ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(tmp)); |