1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/devfreq/governor_simpleondemand.c b/drivers/devfreq/governor_simpleondemand.c
index efad8dcf9028..a2e3eae79011 100644
--- a/drivers/devfreq/governor_simpleondemand.c
+++ b/drivers/devfreq/governor_simpleondemand.c
@@ -25,6 +25,7 @@ static int devfreq_simple_ondemand_func(struct devfreq *df,
         unsigned int dfso_upthreshold = DFSO_UPTHRESHOLD;
         unsigned int dfso_downdifferential = DFSO_DOWNDIFFERENCTIAL;
         struct devfreq_simple_ondemand_data *data = df->data;
+        unsigned long max = (df->max_freq) ? df->max_freq : UINT_MAX;
 
         if (err)
                 return err;
@@ -41,7 +42,7 @@ static int devfreq_simple_ondemand_func(struct devfreq *df,
 
         /* Assume MAX if it is going to be divided by zero */
         if (stat.total_time == 0) {
-                *freq = UINT_MAX;
+                *freq = max;
                 return 0;
         }
 
@@ -54,13 +55,13 @@ static int devfreq_simple_ondemand_func(struct devfreq *df,
         /* Set MAX if it's busy enough */
         if (stat.busy_time * 100 >
             stat.total_time * dfso_upthreshold) {
-                *freq = UINT_MAX;
+                *freq = max;
                 return 0;
         }
 
         /* Set MAX if we do not know the initial frequency */
         if (stat.current_frequency == 0) {
-                *freq = UINT_MAX;
+                *freq = max;
                 return 0;
         }
 
@@ -79,6 +80,11 @@ static int devfreq_simple_ondemand_func(struct devfreq *df,
         b = div_u64(b, (dfso_upthreshold - dfso_downdifferential / 2));
         *freq = (unsigned long) b;
 
+        if (df->min_freq && *freq < df->min_freq)
+                *freq = df->min_freq;
+        if (df->max_freq && *freq > df->max_freq)
+                *freq = df->max_freq;
+
         return 0;
 }