diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-02 18:08:56 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-02 18:08:56 +0200 |
commit | 726dcbe5f5d88080b9106f3a55b95d358b2aa140 (patch) | |
tree | 7699d33c6e8ade748e3c4154933be8d2b475b25d /drivers/cpufreq/cpufreq-cpu0.c | |
parent | 8a21c0e745cf726d5cb5ed0cfdee5857d2dd0ce7 (diff) | |
parent | 19ea1a4400e9b8a3858c358509e2514d4eef785f (diff) |
Merge branch 'pm-fixes'
* pm-fixes:
intel_pstate: fix no_turbo
cpufreq: cpufreq-cpu0: NULL is a valid regulator, part 2
cpufreq: SPEAr: Fix incorrect variable type
PM / hibernate: Fix user space driven resume regression
Diffstat (limited to 'drivers/cpufreq/cpufreq-cpu0.c')
-rw-r--r-- | drivers/cpufreq/cpufreq-cpu0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c index 78c49d8e0f4a..c522a95c0e16 100644 --- a/drivers/cpufreq/cpufreq-cpu0.c +++ b/drivers/cpufreq/cpufreq-cpu0.c @@ -229,7 +229,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) if (of_property_read_u32(np, "clock-latency", &transition_latency)) transition_latency = CPUFREQ_ETERNAL; - if (cpu_reg) { + if (!IS_ERR(cpu_reg)) { struct opp *opp; unsigned long min_uV, max_uV; int i; |