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 50ccb22ace09ad1dceb032efd689af793a732144..4ce97eb046400ef7bd87eb09a3d89daabda5b8bb 100644 (file)
--- 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 */