From 2109b387db48d9ac40e3c0d3f65a606d626dfebe Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Wed, 20 Oct 2010 12:22:39 +0000 Subject: 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 Acked-by: Kinsey Moore Acked-by: Russ Meyerriecks git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9433 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/dahdi-base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/dahdi/dahdi-base.c') 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) { -- cgit v1.2.3