[svn-commits] tilghman: trunk r125853 - /trunk/channels/chan_local.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jun 27 11:00:05 2008
New Revision: 125853

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125853
Log:
Revert half of the fix, as this part may have been unnecessary (related to issue #12914)
Requested here: http://lists.digium.com/pipermail/asterisk-dev/2008-June/033658.html

Modified:
    trunk/channels/chan_local.c

Modified: trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_local.c?view=diff&rev=125853&r1=125852&r2=125853
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Fri Jun 27 11:00:05 2008
@@ -544,11 +544,7 @@
 	if (!p)
 		return -1;
 
-	while (ast_mutex_trylock(&p->lock)) {
-		ast_channel_unlock(ast);
-		usleep(1);
-		ast_channel_lock(ast);
-	}
+	ast_mutex_lock(&p->lock);
 
 	if (p->chan && ast_test_flag(ast, AST_FLAG_ANSWERED_ELSEWHERE)) 
 		ast_set_flag(p->chan, AST_FLAG_ANSWERED_ELSEWHERE);