[svn-commits] kmoore: trunk r420804 - in /trunk: ./ res/res_stasis.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Mon Aug 11 13:46:59 2014
New Revision: 420804

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420804
Log:
Stasis: Use the correct return value

Return the correct value instead of always returning 0 when setting
internal status on unreal channels.

Reported by: Richard Mudgett
........

Merged revisions 420802 from http://svn.asterisk.org/svn/asterisk/branches/12
........

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

Modified:
    trunk/   (props changed)
    trunk/res/res_stasis.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-13-merged (original)
+++ branch-13-merged Mon Aug 11 13:46:59 2014
@@ -1,1 +1,1 @@
-/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639,420657,420717,420742,420758,420779,420796
+/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639,420657,420717,420742,420758,420779,420796,420803

Modified: trunk/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_stasis.c?view=diff&rev=420804&r1=420803&r2=420804
==============================================================================
--- trunk/res/res_stasis.c (original)
+++ trunk/res/res_stasis.c Mon Aug 11 13:46:59 2014
@@ -1940,7 +1940,7 @@
 	}
 	ao2_unlock(unreal_pvt);
 	ao2_ref(unreal_pvt, -1);
-	return 0;
+	return res;
 }
 
 int stasis_app_channel_set_internal(struct ast_channel *chan)