diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-10-20 12:22:39 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-10-20 12:22:39 +0000 |
| commit | 2109b387db48d9ac40e3c0d3f65a606d626dfebe (patch) | |
| tree | 1b8fbd434c697f2035e4fae6cb5fe68cbff8687f /drivers/dahdi | |
| parent | 4b968afdc960a655d85a556fd9e960fc8526ffa7 (diff) | |
dahdi: dahdi_chan_unreg was not cleaning up conferenced channels properly.
'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
Diffstat (limited to 'drivers/dahdi')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index f2b675d..2fcb5ec 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -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) { |