diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-27 23:47:03 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-27 23:47:03 +0400 |
| commit | e11158c0c9ab59d46bb70953f6275643a7a01fa1 (patch) | |
| tree | 64302fccb64d1220631d33c1262ace5bb0d218cb /drivers/cpufreq/tegra-cpufreq.c | |
| parent | 39a95f4861381a87167729be8f71c59ed4efc27d (diff) | |
| parent | 027f6d582c23a492ff06b29d592154f4cd7a246c (diff) | |
| download | linux-e11158c0c9ab59d46bb70953f6275643a7a01fa1.tar.xz | |
Merge branch 'pm-cpufreq-arm' into pm-cpufreq
* pm-cpufreq-arm:
cpufreq: tegra: call CPUFREQ_POSTCHANGE notfier in error cases
cpufreq: s3c64xx: call CPUFREQ_POSTCHANGE notfier in error cases
cpufreq: omap: call CPUFREQ_POSTCHANGE notfier in error cases
cpufreq: imx6q: call CPUFREQ_POSTCHANGE notfier in error cases
cpufreq: exynos: call CPUFREQ_POSTCHANGE notfier in error cases
cpufreq: dbx500: call CPUFREQ_POSTCHANGE notfier in error cases
cpufreq: davinci: call CPUFREQ_POSTCHANGE notfier in error cases
cpufreq: arm-big-little: call CPUFREQ_POSTCHANGE notfier in error cases
cpufreq: s3c2416: fix forgotten driver_data conversions
Diffstat (limited to 'drivers/cpufreq/tegra-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/tegra-cpufreq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/tegra-cpufreq.c b/drivers/cpufreq/tegra-cpufreq.c index 81561be17e8c..cd66b85d927c 100644 --- a/drivers/cpufreq/tegra-cpufreq.c +++ b/drivers/cpufreq/tegra-cpufreq.c @@ -137,12 +137,12 @@ static int tegra_update_cpu_speed(struct cpufreq_policy *policy, if (ret) { pr_err("cpu-tegra: Failed to set cpu frequency to %d kHz\n", freqs.new); - return ret; + freqs.new = freqs.old; } cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); - return 0; + return ret; } static unsigned long tegra_cpu_highest_speed(void) |