[asterisk-commits] file: branch 1.6.1 r188940 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri Apr 17 09:28:45 2009
New Revision: 188940

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=188940
Log:
Merged revisions 188938 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r188938 | file | 2009-04-17 11:26:53 -0300 (Fri, 17 Apr 2009) | 11 lines
  
  Merged revisions 188937 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r188937 | file | 2009-04-17 11:25:57 -0300 (Fri, 17 Apr 2009) | 4 lines
    
    Fix a situation where the DAHDI channel private structure lock was not unlocked when it should have been.
    
    (issue AST-210)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=188940&r1=188939&r2=188940
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Fri Apr 17 09:28:45 2009
@@ -11217,6 +11217,7 @@
 						if (pri->pvts[chanpos]->call == e->ring.call) {
 							ast_log(LOG_WARNING, "Duplicate setup requested on channel %d/%d already in use on span %d\n", 
 								PRI_SPAN(e->ring.channel), PRI_CHANNEL(e->ring.channel), pri->span);
+							ast_mutex_unlock(&pri->pvts[chanpos]->lock);
 							break;
 						} else {
 							/* This is where we handle initial glare */