diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2017-02-07 09:40:05 +0530 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2017-03-13 10:06:55 +0800 |
| commit | 3ea3217cf91804be6ed9b368ef4ac7911eb1dadc (patch) | |
| tree | c225c4ee5949f8906fb07a31a174819d0aa40d33 /drivers | |
| parent | 9aec9082bf3c0fb83020a0f562c9cc8078ac91f1 (diff) | |
| download | linux-stable-3ea3217cf91804be6ed9b368ef4ac7911eb1dadc.tar.gz linux-stable-3ea3217cf91804be6ed9b368ef4ac7911eb1dadc.tar.bz2 linux-stable-3ea3217cf91804be6ed9b368ef4ac7911eb1dadc.zip | |
thermal: cpu_cooling: Check OPP for errors
It is possible for dev_pm_opp_find_freq_exact() to return errors. It was
all fine earlier as dev_pm_opp_get_voltage() had a check within it to
check for invalid OPPs, but dev_pm_opp_put() doesn't have any similar
checks and the callers need to make sure OPP is valid before calling
them.
Also update the later dev_warn_ratelimited() to not print the error
message as the OPP is guaranteed to be valid now.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/thermal/cpu_cooling.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 59f0bd53f329..69d0f430b2d1 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -393,13 +393,20 @@ static int get_static_power(struct cpufreq_cooling_device *cpufreq_device, opp = dev_pm_opp_find_freq_exact(cpufreq_device->cpu_dev, freq_hz, true); + if (IS_ERR(opp)) { + dev_warn_ratelimited(cpufreq_device->cpu_dev, + "Failed to find OPP for frequency %lu: %ld\n", + freq_hz, PTR_ERR(opp)); + return -EINVAL; + } + voltage = dev_pm_opp_get_voltage(opp); dev_pm_opp_put(opp); if (voltage == 0) { dev_err_ratelimited(cpufreq_device->cpu_dev, - "Failed to get voltage for frequency %lu: %ld\n", - freq_hz, IS_ERR(opp) ? PTR_ERR(opp) : 0); + "Failed to get voltage for frequency %lu\n", + freq_hz); return -EINVAL; } |