[asterisk-commits] mnicholson: trunk r205047 - /trunk/channels/sig_analog.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Tue Jul  7 13:24:13 2009
New Revision: 205047

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=205047
Log:
Fix a deadlock in sig_analog

Modified:
    trunk/channels/sig_analog.c

Modified: trunk/channels/sig_analog.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/sig_analog.c?view=diff&rev=205047&r1=205046&r2=205047
==============================================================================
--- trunk/channels/sig_analog.c (original)
+++ trunk/channels/sig_analog.c Tue Jul  7 13:24:13 2009
@@ -536,7 +536,7 @@
 		}
 		/* Three-way is now the REAL */
 		analog_swap_subs(p, ANALOG_SUB_THREEWAY, ANALOG_SUB_REAL);
-		ast_channel_unlock(p->subs[ANALOG_SUB_THREEWAY].owner);
+		ast_channel_unlock(p->subs[ANALOG_SUB_REAL].owner); /* unlock REAL because THREEWAY has become REAL */
 		analog_unalloc_sub(p, ANALOG_SUB_THREEWAY);
 		/* Tell the caller not to hangup */
 		return 1;