From: Jeff Peeler <jpeeler@digium.com>
Date: Tue, 6 Oct 2009 23:58:30 +0000 (+0000)
Subject: Merged revisions 222463 via svnmerge from
X-Git-Tag: 1.6.1.10-rc1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2371977ff91389d93fa3cc3172dcd54ac8ff2a17;p=thirdparty%2Fasterisk.git

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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@222465 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index d68876a7f0..cdfb867b39 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -5679,7 +5679,10 @@ static struct ast_frame  *dahdi_read(struct ast_channel *ast)
 		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;