diff options
| author | Jason Parker <jparker@digium.com> | 2008-11-21 20:15:47 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2008-11-21 20:15:47 +0000 |
| commit | 4aa06984e25ac94166d28e60ee34bc42e4f6df48 (patch) | |
| tree | 23d7651b8ebda08cc1c00841dfd93ac5dcb70789 /drivers/dahdi | |
| parent | 987cf892483af93c7f787bace4681aeac41719fb (diff) | |
Fix a think-o in numeric comparison. Swap order to make it more clear.
(closes issue #13813)
Reported by: ys
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@5360 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 4b0d713..04650f6 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -4045,13 +4045,13 @@ static int dahdi_ctl_ioctl(struct inode *inode, struct file *file, unsigned int if (copy_from_user(&tdp, (struct dahdi_dialparams *) data, sizeof(tdp))) return -EFAULT; - if ((tdp.dtmf_tonelen <= 4000) || (tdp.dtmf_tonelen >= 10)) { + if ((tdp.dtmf_tonelen >= 10) && (tdp.dtmf_tonelen <= 4000)) { global_dialparams.dtmf_tonelen = tdp.dtmf_tonelen; } - if ((tdp.mfv1_tonelen <= 4000) || (tdp.mfv1_tonelen >= 10)) { + if ((tdp.mfv1_tonelen >= 10) && (tdp.mfv1_tonelen <= 4000)) { global_dialparams.mfv1_tonelen = tdp.mfv1_tonelen; } - if ((tdp.mfr2_tonelen <= 4000) || (tdp.mfr2_tonelen >= 10)) { + if ((tdp.mfr2_tonelen >= 10) && (tdp.mfr2_tonelen <= 4000)) { global_dialparams.mfr2_tonelen = tdp.mfr2_tonelen; } |