[asterisk-commits] jpeeler: branch 1.6.1 r222465 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Oct  6 18:58:30 2009
New Revision: 222465

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=222465
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)
    
    (closes issue #15683)
    Reported by: alecdavis
  ........
................

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://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=222465&r1=222464&r2=222465
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Tue Oct  6 18:58:30 2009
@@ -5679,7 +5679,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;