[svn-commits] rmeyerriecks: branch linux/mspiceland/dahdi-qfalc31 r7664 - /linux/team/mspic...

[SVN commits to the Digium repositories]

Author: rmeyerriecks
Date: Thu Dec  3 17:39:53 2009
New Revision: 7664

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7664
Log:
wct4xxp - Reworking the branch to fit in with the trunk code a bit better

Modified:
    linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c

Modified: linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c?view=diff&rev=7664&r1=7663&r2=7664
==============================================================================
--- linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c Thu Dec  3 17:39:53 2009
@@ -2667,12 +2667,12 @@
 
 	if (c & 0x20) {
 		if (ts->alarmcount >= alarmdebounce) {
-			dev_info(&wc->dev->dev, "Loss-of-signal span %d\n",
-								   span+1);
-			alarms |= DAHDI_ALARM_RED;
+
 			/* Disable Slip Interrupts */
 			e = __t4_framer_in(wc, span, 0x17);
 			__t4_framer_out(wc, span, 0x17, (e|0x03));
+
+			alarms |= DAHDI_ALARM_RED;
 		} else {
 			if (unlikely(debug && !ts->alarmcount)) {
 				/* starting to debounce LOF/LFA */
@@ -2687,6 +2687,13 @@
 
 	if (c & 0x80) { /* LOS */
 		if (ts->losalarmcount >= losalarmdebounce)
+			dev_info(&wc->dev->dev, "Loss-of-signal span %d\n",
+								   span+1);
+
+			/* Disable Slip Interrupts */
+			e = __t4_framer_in(wc, span, 0x17);
+			__t4_framer_out(wc, span, 0x17, (e|0x03));
+
 			alarms |= DAHDI_ALARM_RED;
 		else {
 			if (unlikely(debug && !ts->losalarmcount)) {