[svn-commits] qwell: branch 1.4 r4586 - /branches/1.4/kernel/zaptel-base.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Fri Nov 21 14:14:19 2008
New Revision: 4586

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4586
Log:
Fix a think-o in numeric comparison.  Swap order to make it more clear.

(closes issue #13813)
Reported by: ys

Modified:
    branches/1.4/kernel/zaptel-base.c

Modified: branches/1.4/kernel/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/zaptel-base.c?view=diff&rev=4586&r1=4585&r2=4586
==============================================================================
--- branches/1.4/kernel/zaptel-base.c (original)
+++ branches/1.4/kernel/zaptel-base.c Fri Nov 21 14:14:19 2008
@@ -3957,13 +3957,13 @@
 		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;
 		}