From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 15 Oct 2014 19:39:15 +0000 (+0000)
Subject: chan_motif: Cleanup jingle_tech.capabilities only once.
X-Git-Tag: 14.0.0-beta1~1552
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28c11fff78d0d653bff96435427e7550f2481c2f;p=thirdparty%2Fasterisk.git

chan_motif: Cleanup jingle_tech.capabilities only once.
........

Merged revisions 425627 from http://svn.asterisk.org/svn/asterisk/branches/13


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

diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index ebc77f8f42..e5e72283a9 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -2756,7 +2756,6 @@ static int load_module(void)
 	ast_format_cap_append_by_type(jingle_tech.capabilities, AST_MEDIA_TYPE_AUDIO);
 
 	if (aco_process_config(&cfg_info, 0)) {
-		ao2_ref(jingle_tech.capabilities, -1);
 		ast_log(LOG_ERROR, "Unable to read config file motif.conf. Module loaded but not running.\n");
 		aco_info_destroy(&cfg_info);
 		ao2_cleanup(jingle_tech.capabilities);
@@ -2784,7 +2783,6 @@ static int load_module(void)
 	return 0;
 
 end:
-	ao2_cleanup(jingle_tech.capabilities);
 	ast_rtp_glue_unregister(&jingle_rtp_glue);
 
 	if (sched) {