Index: channels/chan_local.c
===================================================================
--- channels/chan_local.c	(revision 152213)
+++ channels/chan_local.c	(working copy)
@@ -545,8 +545,12 @@
 	} else {
 		p->owner = NULL;
 		ast_module_user_remove(p->u_owner);
+		while (p->chan && ast_channel_trylock(p->chan)) {
+			DEADLOCK_AVOIDANCE(&p->lock);
+		}
 		if (p->chan) {
 			ast_queue_hangup(p->chan);
+			ast_channel_unlock(p->chan);
 		}
 	}