[asterisk-commits] coreyfarrell: trunk r424555 - in /trunk: ./ channels/chan_motif.c

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Sat Oct  4 19:15:43 2014
New Revision: 424555

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424555
Log:
chan_motif: Correct last commit to use ao2_cleanup to free format cap

This fix applies to 13 and trunk.

ASTERISK-24384 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4043/
........

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_motif.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/channels/chan_motif.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_motif.c?view=diff&rev=424555&r1=424554&r2=424555
==============================================================================
--- trunk/channels/chan_motif.c (original)
+++ trunk/channels/chan_motif.c Sat Oct  4 19:15:43 2014
@@ -2759,7 +2759,7 @@
 		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);
-		ast_format_cap_destroy(jingle_tech.capabilities);
+		ao2_cleanup(jingle_tech.capabilities);
 		jingle_tech.capabilities = NULL;
 		return AST_MODULE_LOAD_DECLINE;
 	}
@@ -2794,7 +2794,7 @@
 	aco_info_destroy(&cfg_info);
 	ao2_global_obj_release(globals);
 
-	ast_format_cap_destroy(jingle_tech.capabilities);
+	ao2_cleanup(jingle_tech.capabilities);
 	jingle_tech.capabilities = NULL;
 
 	return AST_MODULE_LOAD_FAILURE;