diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-17 14:29:32 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-17 14:29:32 +0000 |
| commit | de97a183612688b7ae4ed6f0b3fb5921526534c1 (patch) | |
| tree | 032f3ac56cbea5fa9e2ae6ef48ecc826879b11ea /channels | |
| parent | a458031e7f06c4df8cd57bd01db01c983fa2cbea (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@188941 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index ebd2a59f5..9ac1d90a5 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -12668,6 +12668,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 */ |