From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 21 Jun 2007 15:23:36 +0000 (+0000)
Subject: Merged revisions 70726 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2302
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffa9367f7b45b5f0b82a57eede68aec26cda6199;p=thirdparty%2Fasterisk.git

Merged revisions 70726 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r70726 | russell | 2007-06-21 10:21:16 -0500 (Thu, 21 Jun 2007) | 2 lines

Remove a couple of duplicate unlocks

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70728 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index ebb1403a4d..97101b91b2 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4360,14 +4360,12 @@ static int sla_trunk_exec(struct ast_channel *chan, void *data)
 	AST_RWLIST_UNLOCK(&sla_trunks);
 	if (!trunk) {
 		ast_log(LOG_ERROR, "SLA Trunk '%s' not found!\n", trunk_name);
-		AST_RWLIST_UNLOCK(&sla_trunks);
 		pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "FAILURE");
 		return 0;
 	}
 	if (trunk->chan) {
 		ast_log(LOG_ERROR, "Call came in on %s, but the trunk is already in use!\n",
 			trunk_name);
-		AST_RWLIST_UNLOCK(&sla_trunks);
 		pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "FAILURE");
 		return 0;
 	}