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_oss.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_oss.c')
| -rw-r--r-- | channels/chan_oss.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 92c7374db..5ae18f362 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -799,7 +799,6 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *o, char *ext, char *ctx, c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", ext, ctx, linkedid, 0, "Console/%s", o->device + 5); if (c == NULL) return NULL; - ast_channel_lock(c); ast_channel_tech_set(c, &oss_tech); if (o->sounddev < 0) setformat(o, O_RDWR); @@ -830,7 +829,6 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *o, char *ext, char *ctx, o->owner = c; ast_module_ref(ast_module_info->self); ast_jb_configure(c, &global_jbconf); - ast_channel_unlock(c); if (state != AST_STATE_DOWN) { if (ast_pbx_start(c)) { ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(c)); |