[svn-commits] sruffell: linux/trunk r9433 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Wed Oct 20 07:22:39 2010
New Revision: 9433

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9433
Log:
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 at digium.com>
Acked-by: Kinsey Moore <kmoore at digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks at digium.com>

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=9433&r1=9432&r2=9433
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Wed Oct 20 07:22:39 2010
@@ -2096,9 +2096,9 @@
 			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) {