[svn-commits] rmudgett: branch rmudgett/ect r258510 - /team/rmudgett/ect/channels/sig_pri.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Apr 21 17:46:36 2010
New Revision: 258510

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=258510
Log:
Address a reviewboard deadlock concern.

Modified:
    team/rmudgett/ect/channels/sig_pri.c

Modified: team/rmudgett/ect/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ect/channels/sig_pri.c?view=diff&rev=258510&r1=258509&r2=258510
==============================================================================
--- team/rmudgett/ect/channels/sig_pri.c (original)
+++ team/rmudgett/ect/channels/sig_pri.c Wed Apr 21 17:46:36 2010
@@ -1574,9 +1574,10 @@
 		return -1;
 	}
 
+	/* Deadlock avoidance is attempted. */
 	sig_pri_lock_private(pri->pvts[call_1_chanpos]);
+	sig_pri_lock_owner(pri, call_1_chanpos);
 	sig_pri_lock_private(pri->pvts[call_2_chanpos]);
-	sig_pri_lock_owner(pri, call_1_chanpos);
 	sig_pri_lock_owner(pri, call_2_chanpos);
 
 	call_1_ast = pri->pvts[call_1_chanpos]->owner;