summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2009-11-23 19:20:59 +0000
committerShaun Ruffell <sruffell@digium.com>2009-11-23 19:20:59 +0000
commit40b4d5624a63d16f920df6b5965a7bfc15ae5486 (patch)
treea28b7934792a54a1704ca595991beab1c392fedd /drivers
parent34f636bf0da40136856e9c733aaebf8904f49203 (diff)
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. ........ git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.2@7636 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dahdi/wcte12xp/base.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c
index c0164db..5a730af 100644
--- a/drivers/dahdi/wcte12xp/base.c
+++ b/drivers/dahdi/wcte12xp/base.c
@@ -1584,7 +1584,8 @@ static void handle_leds(struct t1 *wc)
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);