diff options
| author | Russ Meyerriecks <rmeyerreicks@digium.com> | 2010-03-29 20:43:33 +0000 |
|---|---|---|
| committer | Russ Meyerriecks <rmeyerreicks@digium.com> | 2010-03-29 20:43:33 +0000 |
| commit | 31f168cfe0702fabd3950bc84057bbc4aacc2956 (patch) | |
| tree | de259f1bc44873de78a1f4f9f56b1ae939926863 | |
| parent | c3aa29c3e25998ddf1859eeac0e288c702d5cc77 (diff) | |
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.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8443 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 6a34d04..a484eeb 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -4534,8 +4534,10 @@ static int dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long da 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); |