[svn-commits] rmeyerriecks: linux/trunk r8443 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: rmeyerriecks
Date: Mon Mar 29 15:43:33 2010
New Revision: 8443

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8443
Log:
dahdi-base: Fix a bug preventing clobbering maint state

Now the errror injection code prevents placing the driver into a loopback
state in a less forceful way.

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=8443&r1=8442&r2=8443
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Mon Mar 29 15:43:33 2010
@@ -4534,8 +4534,10 @@
 		case DAHDI_MAINT_PRBS:
 		case DAHDI_RESET_COUNTERS:
 			/* Prevent notifying an alarm state for generic
-			   maintenance functions */
-			spans[maint.spanno]->maintstat = 0;
+			   maintenance functions, unless the driver is
+			   already in a maint state */
+			if(!i)
+				spans[maint.spanno]->maintstat = 0;
 
 			rv = spans[maint.spanno]->maint(spans[maint.spanno],
 							maint.command);