Merge branch 'upstream' into irq-pio

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 037f6bf4543c..e07a35487bde 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -176,8 +176,7 @@ static ssize_t store_up_threshold(struct cpufreq_policy *unused,
         ret = sscanf (buf, "%u", &input);
 
         mutex_lock(&dbs_mutex);
-        if (ret != 1 || input > 100 || input < 0 ||
-                        input <= dbs_tuners_ins.down_threshold) {
+        if (ret != 1 || input > 100 || input <= dbs_tuners_ins.down_threshold) {
                 mutex_unlock(&dbs_mutex);
                 return -EINVAL;
         }
@@ -196,8 +195,7 @@ static ssize_t store_down_threshold(struct cpufreq_policy *unused,
         ret = sscanf (buf, "%u", &input);
 
         mutex_lock(&dbs_mutex);
-        if (ret != 1 || input > 100 || input < 0 ||
-                        input >= dbs_tuners_ins.up_threshold) {
+        if (ret != 1 || input > 100 || input >= dbs_tuners_ins.up_threshold) {
                 mutex_unlock(&dbs_mutex);
                 return -EINVAL;
         }