summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2011-11-07 22:40:11 +0000
committerShaun Ruffell <sruffell@digium.com>2011-11-07 22:40:11 +0000
commitb30c64fb58f8310613e1ae4ce5958136bf00d66b (patch)
treeacd5445b5bca4a83569c29846db2bfad17ca6a84
parent0e130bb977986dca79b4fad787e640525e7283eb (diff)
dahdi: Fix typo in previous commit which forced some spans to always fail assignment.
I misssed a small typo in r10328 "Extra debugging aids and messages" that would force any span that supports a hardware preechocan to always fail assignment with -EFAULT. Signed-off-by: Shaun Ruffell <sruffell@digium.com> git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10330 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/dahdi-base.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index b1b8332..67150c8 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -6884,10 +6884,11 @@ static int _dahdi_assign_span(struct dahdi_span *span, unsigned int spanno,
if (span->ops->enable_hw_preechocan ||
span->ops->disable_hw_preechocan) {
if ((NULL == span->ops->enable_hw_preechocan) ||
- (NULL == span->ops->disable_hw_preechocan))
+ (NULL == span->ops->disable_hw_preechocan)) {
dev_notice(span->parent->dev.parent,
"span with inconsistent enable/disable hw_preechocan");
return -EFAULT;
+ }
}
if (!span->deflaw) {