[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r322064 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon Jun  6 08:14:04 2011
New Revision: 322064

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322064
Log:
remove white space in ooh323
missing unlock in chan_sip.c

Modified:
    team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c
    team/irroot/distrotech-customers-trunk/channels/chan_sip.c

Modified: team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c?view=diff&rev=322064&r1=322063&r2=322064
==============================================================================
--- team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c (original)
+++ team/irroot/distrotech-customers-trunk/addons/chan_ooh323.c Mon Jun  6 08:14:04 2011
@@ -3858,7 +3858,7 @@
 	ast_mutex_unlock(&userl.lock);
 	return 0;
 }
- 
+
 static int unload_module(void)
 {
 	struct ooh323_pvt *p;

Modified: team/irroot/distrotech-customers-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_sip.c?view=diff&rev=322064&r1=322063&r2=322064
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_sip.c Mon Jun  6 08:14:04 2011
@@ -6356,6 +6356,7 @@
 			if (!ast_channel_trylock(bridge)) {
 				ast_log(LOG_WARNING, "Attempting to change formats making %s and %s compat.\n", ast->name, bridge->name);
 				ast_channel_make_compatible(ast, bridge);
+				ast_channel_unlock(bridge);
 			}
 			return 0;
 		}