FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: dahdi_chan_unreg was not cleaning up conferenced channels properly.

Browse Source 
'is_monitor_mode()' and DAHDI_CONF_DIGITALMON were mutally exclusive.
Fixes recent regression introduced in revision 9367.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9433 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell
2010-10-20 12:22:39 +00:00
parent a8b1e2b662
commit f5f0958381
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dahdi/dahdi-base.c
View File

@@ -2096,9 +2096,9 @@ static void dahdi_chan_unreg(struct dahdi_chan *chan)
pos->master = pos;
if ((pos->confna == chan->channo) &&
is_monitor_mode(pos->confmode) &&
(is_monitor_mode(pos->confmode) ||
((pos->confmode & DAHDI_CONF_MODE_MASK) ==
DAHDI_CONF_DIGITALMON)) {
DAHDI_CONF_DIGITALMON))) {
/* Take them out of conference with us */
/* release conference resource if any */
if (pos->confna) {