[asterisk-commits] jpeeler: branch 1.6.2 r222466 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Oct  6 18:59:51 2009
New Revision: 222466

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=222466
Log:
Merged revisions 222463 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r222463 | jpeeler | 2009-10-06 18:56:01 -0500 (Tue, 06 Oct 2009) | 14 lines
  
  Merged revisions 222462 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r222462 | jpeeler | 2009-10-06 18:51:19 -0500 (Tue, 06 Oct 2009) | 8 lines
    
    Add missing unlock(s) in dahdi_read
    
    (two cases in trunk, and 1.6.2)
    
    (closes issue #15683)
    Reported by: alecdavis
  ........
................

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

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

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=222466&r1=222465&r2=222466
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Tue Oct  6 18:59:51 2009
@@ -6725,7 +6725,10 @@
 		return NULL;
 	}
 
-	if ((p->radio || (p->oprmode < 0)) && p->inalarm) return NULL;
+	if ((p->radio || (p->oprmode < 0)) && p->inalarm) {
+		ast_mutex_unlock(&p->lock);
+		return NULL;
+	}
 
 	p->subs[idx].f.frametype = AST_FRAME_NULL;
 	p->subs[idx].f.datalen = 0;
@@ -7024,6 +7027,7 @@
 							if (res < 0) {
 								ast_log(LOG_WARNING, "Unable to initiate dialing on trunk channel %d\n", p->channel);
 								p->dop.dialstr[0] = '\0';
+								ast_mutex_unlock(&p->lock);
 								return NULL;
 							} else {
 								ast_log(LOG_DEBUG, "Sent deferred digit string: %s\n", p->dop.dialstr);