From b64e3d2f1210d6eccd0af0d4b9b1bda006384b32 Mon Sep 17 00:00:00 2001 From: qwell Date: Fri, 21 Nov 2008 20:14:19 +0000 Subject: 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.digium.com/svn/zaptel/branches/1.4@4586 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- kernel/zaptel-base.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/zaptel-base.c b/kernel/zaptel-base.c index e8b2fc4..71a982b 100644 --- a/kernel/zaptel-base.c +++ b/kernel/zaptel-base.c @@ -3957,13 +3957,13 @@ static int zt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd if (copy_from_user(&tdp, (struct zt_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; } -- cgit v1.2.3