chan_motif: Cleanup jingle_tech.capabilities only once.
authorRichard Mudgett <rmudgett@digium.com>
Wed, 15 Oct 2014 19:39:15 +0000 (19:39 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 15 Oct 2014 19:39:15 +0000 (19:39 +0000)
........

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

channels/chan_motif.c

index ebc77f8..e5e7228 100644 (file)
@@ -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) {