[svn-commits] sruffell: branch linux/2.2 r7636 - in /linux/branches/2.2: ./ drivers/dahdi/w...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Nov 23 13:20:59 2009
New Revision: 7636

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7636
Log:
Merged revisions 7632 via svnmerge from 
https://origsvn.digium.com/svn/dahdi/linux/trunk

........
  r7632 | mspiceland | 2009-11-23 13:13:17 -0600 (Mon, 23 Nov 2009) | 4 lines
  
  Even if we are debouncing the LOS declaration, we still expect the LED to
  turn red as soon as we unplug the physical cable.  This impliments this on
  the wcte12xp just as it already does on the wct4xxp.
........

Modified:
    linux/branches/2.2/   (props changed)
    linux/branches/2.2/drivers/dahdi/wcte12xp/base.c

Propchange: linux/branches/2.2/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: linux/branches/2.2/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/wcte12xp/base.c?view=diff&rev=7636&r1=7635&r2=7636
==============================================================================
--- linux/branches/2.2/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/branches/2.2/drivers/dahdi/wcte12xp/base.c Mon Nov 23 13:20:59 2009
@@ -1584,7 +1584,8 @@
 
 	led = wc->ledstate;
 
-	if (wc->span.alarms & (DAHDI_ALARM_RED | DAHDI_ALARM_BLUE)) {
+	if ((wc->span.alarms & (DAHDI_ALARM_RED | DAHDI_ALARM_BLUE))
+		|| wc->losalarmcount) {
 		/* When we're in red alarm, blink the led once a second. */
 		if (time_after(jiffies, wc->blinktimer)) {
 			led = (led & __LED_GREEN) ? SET_LED_RED(led) : UNSET_LED_REDGREEN(led);