Wrong locking style got merged from 1.4 to trunk. My mistake.
authorMark Michelson <mmichelson@digium.com>
Tue, 4 Dec 2007 17:51:59 +0000 (17:51 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 4 Dec 2007 17:51:59 +0000 (17:51 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90899 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_queue.c

index a1219e4..5312970 100644 (file)
@@ -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;
                        }