[dahdi-commits] sruffell: branch linux/2.5 r10305 - /linux/branches/2.5/drivers/dahdi/

[SVN commits to the DAHDI project]

Author: sruffell
Date: Wed Nov  2 15:01:58 2011
New Revision: 10305

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10305
Log:
dahdi: First span registered becomes master by default.

r10205 "dahdi: Check for master in DAHDI_STARTUP / resolves MeetMe
regression." did not handle the case for the wcb4xxp driver since it
would set DAHDI_FLAG_RUNNING as part of the probe. Therefore, the
DAHDI_STARTUP ioctl was never processed for it, creating a situation
where audio is missing on channels that are conferenced with channels on
the BRI spans.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10304

Modified:
    linux/branches/2.5/drivers/dahdi/dahdi-base.c

Modified: linux/branches/2.5/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.5/drivers/dahdi/dahdi-base.c?view=diff&rev=10305&r1=10304&r2=10305
==============================================================================
--- linux/branches/2.5/drivers/dahdi/dahdi-base.c (original)
+++ linux/branches/2.5/drivers/dahdi/dahdi-base.c Wed Nov  2 15:01:58 2011
@@ -3683,10 +3683,11 @@
 	spin_lock_irqsave(&chan_lock, flags);
 	old_master = master;
 	list_for_each_entry(s, &span_list, node) {
-		if (s->alarms)
+		if (s->alarms && old_master)
 			continue;
 		if (!is_analog_span(s) &&
-		    !test_bit(DAHDI_FLAGBIT_RUNNING, &s->flags))
+		    !test_bit(DAHDI_FLAGBIT_RUNNING, &s->flags) &&
+		    old_master)
 			continue;
 		if (!can_provide_timing(s))
 			continue;