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

[SVN commits to the Digium repositories]

Author: rmeyerriecks
Date: Fri Sep 21 13:16:30 2012
New Revision: 10718

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10718
Log:
dahdi-base: Minor maint mode error

The previous maint state was saved regardless if the base driver returned an
error or not. This caused strange behavior in dahdi tools. Moved the maint
state save to after the switch case to reflect this.

https://issues.asterisk.org/jira/browse/DAHDI-984

Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>

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=10718&r1=10717&r2=10718
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Fri Sep 21 13:16:30 2012
@@ -5188,8 +5188,7 @@
 	spin_lock_irqsave(&s->lock, flags);
 	  /* save current maint state */
 	i = s->maintstat;
-	  /* set maint mode */
-	s->maintstat = maint.command;
+
 	switch (maint.command) {
 	case DAHDI_MAINT_NONE:
 	case DAHDI_MAINT_LOCALLOOP:
@@ -5248,6 +5247,10 @@
 		put_span(s);
 		return -ENOSYS;
 	}
+
+	/* set maint mode */
+	s->maintstat = maint.command;
+
 	dahdi_alarm_notify(s);  /* process alarm-related events */
 	spin_unlock_irqrestore(&s->lock, flags);
 	put_span(s);