Index: channels/chan_local.c
===================================================================
--- channels/chan_local.c	(revision 114105)
+++ channels/chan_local.c	(working copy)
@@ -514,7 +514,13 @@
 			/* Deadlock avoidance */
 			while (p->owner && ast_channel_trylock(p->owner)) {
 				ast_mutex_unlock(&p->lock);
+				if (ast) {
+					ast_channel_unlock(ast);
+				}
 				usleep(1);
+				if (ast) {
+					ast_channel_lock(ast);
+				}
 				ast_mutex_lock(&p->lock);
 			}
 			if (p->owner) {