diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-01-25 00:02:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-01-25 00:02:08 +0100 |
| commit | e4c9d8efe6bdc844071d68960dfa2003c5cf6449 (patch) | |
| tree | 3c3018f75fbfde7a8cc5247e0097b5046f8fa153 /drivers/devfreq/governor_userspace.c | |
| parent | d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5 (diff) | |
| parent | 6530b9dea1b7f33eaf79ba625e3a99f2455f3eb1 (diff) | |
Merge branch 'devfreq-for-next' of git://git.infradead.org/users/kmpark/linux-samsung into pm-devfreqrafael-pm-devfreq
* 'devfreq-for-next' of git://git.infradead.org/users/kmpark/linux-samsung:
PM / devfreq: add min/max_freq limit requested by users.
PM / devfreq: fixed syntax errors.
devfreq: Remove MODULE_ALIAS for exynos4 busfreq driver
devfreq: exynos4_bus: Use dev_get_drvdata at appropriate places
Diffstat (limited to 'drivers/devfreq/governor_userspace.c')
| -rw-r--r-- | drivers/devfreq/governor_userspace.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/devfreq/governor_userspace.c b/drivers/devfreq/governor_userspace.c index 4f8b563da782..0681246fc89d 100644 --- a/drivers/devfreq/governor_userspace.c +++ b/drivers/devfreq/governor_userspace.c @@ -25,10 +25,19 @@ static int devfreq_userspace_func(struct devfreq *df, unsigned long *freq) { struct userspace_data *data = df->data; - if (!data->valid) + if (data->valid) { + unsigned long adjusted_freq = data->user_frequency; + + if (df->max_freq && adjusted_freq > df->max_freq) + adjusted_freq = df->max_freq; + + if (df->min_freq && adjusted_freq < df->min_freq) + adjusted_freq = df->min_freq; + + *freq = adjusted_freq; + } else { *freq = df->previous_freq; /* No user freq specified yet */ - else - *freq = data->user_frequency; + } return 0; } |