From: Mark Michelson Date: Mon, 1 Jun 2009 14:42:57 +0000 (+0000) Subject: Remove extra lock from local_indicate in connected line case. X-Git-Tag: 11.0.0-beta1~4752 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bde0b9ed25c2f39e37f8fd35ed7938304ff8853;p=thirdparty%2Fasterisk.git Remove extra lock from local_indicate in connected line case. Oh, and this fixes a deadlock I was seeing. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@198529 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_local.c b/channels/chan_local.c index 980afabdca..5eba90f4b7 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -434,7 +434,6 @@ static int local_indicate(struct ast_channel *ast, int condition, const void *da } f.subclass = condition; f.data.ptr = frame_data; - ast_mutex_lock(&p->lock); if (!(res = local_queue_frame(p, isoutbound, &f, ast, 1))) { ast_mutex_unlock(&p->lock); }