summaryrefslogtreecommitdiff
path: root/drivers/dahdi/dahdi-base.c
diff options
context:
space:
mode:
authorRuss Meyerriecks <rmeyerreicks@digium.com>2010-04-26 21:49:55 +0000
committerRuss Meyerriecks <rmeyerreicks@digium.com>2010-04-26 21:49:55 +0000
commit6c1f6af1b0d9263aa8f1fec21d951798e573a13c (patch)
tree224ecf0887359beb60dfcdbc0c768ff879768fc5 /drivers/dahdi/dahdi-base.c
parent75d6e399df54e338c9a02c35168fa107deea25bc (diff)
dahdi-base: Reverted a change from last patch
Removed a change to dahdi-base from last patch which might have caused compatibility with drivers other than the wcte12xp. wcte12xp: The channel clear/rbs function no longer reads the register first. It now uses the span's channel flags to determine each channels clear state. Also added various minor readability improvements. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8569 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/dahdi-base.c')
-rw-r--r--drivers/dahdi/dahdi-base.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index 8aa1f1c..eba0bdc 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -4288,10 +4288,8 @@ static int dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long da
}
if (!res && chans[ch.chan]->span->chanconfig) {
- spin_unlock_irqrestore(&chans[ch.chan]->lock, flags);
res = chans[ch.chan]->span->chanconfig(chans[ch.chan],
ch.sigtype);
- spin_lock_irqsave(&chans[ch.chan]->lock, flags);
}
#ifdef CONFIG_DAHDI_NET