summaryrefslogtreecommitdiff
path: root/channels/chan_oss.c
diff options
context:
space:
mode:
authorKevin Harwell <kharwell@digium.com>2013-12-18 20:48:49 +0000
committerKevin Harwell <kharwell@digium.com>2013-12-18 20:48:49 +0000
commited0c493222359dff36edba021877dee3c6c962bf (patch)
tree75554b77830cec5bb6973c45a0701a166be05835 /channels/chan_oss.c
parent28c0cb28d0815e5e59ab99b60ac6b50e1ed9cbae (diff)
chan_oss.c: channel being locked twice and unlocked once
Removed channel lock as it is now being down in ast_channel_alloc ........ Merged revisions 404261 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_oss.c')
-rw-r--r--channels/chan_oss.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 92c7374db..3a52ac9db 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);