Merged revisions 125853 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r125853 | tilghman | 2008-06-27 11:00:05 -0500 (Fri, 27 Jun 2008) | 3 lines

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125854 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_local.c

@@ -516,11 +516,7 @@ static int local_hangup(struct ast_channel *ast)
 	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);