From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 4 Dec 2007 17:51:59 +0000 (+0000)
Subject: Wrong locking style got merged from 1.4 to trunk. My mistake.
X-Git-Tag: 1.6.0-beta1~3^2~560
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d1fb935bacde6cf986ad92ef97abc4e69f3859b;p=thirdparty%2Fasterisk.git

Wrong locking style got merged from 1.4 to trunk. My mistake.



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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index a1219e45f0..531297025b 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2818,9 +2818,9 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 		if (!datastore) {
 			if(!(datastore = ast_channel_datastore_alloc(&dialed_interface_info, NULL))) {
 				ao2_ref(cur, -1);
-				ast_mutex_unlock(&qe->parent->lock);
+				ao2_unlock(qe->parent);
 				if(use_weight)
-					AST_LIST_UNLOCK(&queues);
+					ao2_unlock(queues);
 				free(tmp);
 				goto out;
 			}
@@ -2843,9 +2843,9 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 			if(!(di = ast_calloc(1, sizeof(*di) + strlen(cur->interface)))) {
 				ao2_ref(cur, -1);
 				AST_LIST_UNLOCK(dialed_interfaces);
-				ast_mutex_unlock(&qe->parent->lock);
+				ao2_unlock(qe->parent);
 				if(use_weight)
-					AST_LIST_UNLOCK(&queues);
+					ao2_unlock(queues);
 				free(tmp);
 				goto out;
 			}