From: Joshua Colp <jcolp@digium.com>
Date: Fri, 17 Apr 2009 14:28:45 +0000 (+0000)
Subject: Merged revisions 188938 via svnmerge from
X-Git-Tag: 1.6.1.0-rc5~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adcf824dfd5cd93dd19aa89af4e96494717cf578;p=thirdparty%2Fasterisk.git

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


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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 50ccb22ace..4ce97eb046 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -11217,6 +11217,7 @@ static void *pri_dchannel(void *vpri)
 						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 */