diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-18 18:58:33 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-18 18:58:33 +0400 |
| commit | 4ba25a496f62129a2ad8c2436ab2b402752dc66c (patch) | |
| tree | 8abf41a79f293832a430a9609530c24cd365466c /drivers/cpufreq/dbx500-cpufreq.c | |
| parent | 390de835b61228abf6646f2b14530edca8d7512f (diff) | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
| download | linux-4ba25a496f62129a2ad8c2436ab2b402752dc66c.tar.xz | |
Merge tag 'v3.11' into next
Merge with mainline to bring in sync changes to cyttsp4 driver.
Diffstat (limited to 'drivers/cpufreq/dbx500-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/dbx500-cpufreq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c index 6ec6539ae041..26321cdc1946 100644 --- a/drivers/cpufreq/dbx500-cpufreq.c +++ b/drivers/cpufreq/dbx500-cpufreq.c @@ -57,13 +57,13 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy, if (ret) { pr_err("dbx500-cpufreq: Failed to set armss_clk to %d Hz: error %d\n", freqs.new * 1000, ret); - return ret; + freqs.new = freqs.old; } /* post change notification */ cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); - return 0; + return ret; } static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu) @@ -82,7 +82,7 @@ static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu) return freq_table[i].frequency; } -static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy) +static int dbx500_cpufreq_init(struct cpufreq_policy *policy) { int res; |