From: Kevin Harwell Date: Wed, 18 Dec 2013 20:48:49 +0000 (+0000) Subject: chan_oss.c: channel being locked twice and unlocked once X-Git-Tag: 13.0.0-beta1~729 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed0c493222359dff36edba021877dee3c6c962bf;p=thirdparty%2Fasterisk.git 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 --- diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 92c7374db2..3a52ac9db4 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);