2020-11-26 09:29:07

by Wangshaobo (bobo)

Subject: [PATCH v2] cpufreq: Fix error return code in cpufreq_online()

Fix to return proper error code instead of 0 in cpufreq_online(), as done
elsewhere in this function.

Signed-off-by: Wang ShaoBo <[email protected]>
---
drivers/cpufreq/cpufreq.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 1e7e3f2ff09f..d3a28de35593 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1391,8 +1391,10 @@ static int cpufreq_online(unsigned int cpu)

policy->min_freq_req = kzalloc(2 * sizeof(*policy->min_freq_req),
GFP_KERNEL);
- if (!policy->min_freq_req)
+ if (!policy->min_freq_req) {
+ ret = -ENOMEM;
goto out_destroy_policy;
+ }

ret = freq_qos_add_request(&policy->constraints,
policy->min_freq_req, FREQ_QOS_MIN,
@@ -1429,6 +1431,7 @@ static int cpufreq_online(unsigned int cpu)
if (cpufreq_driver->get && has_target()) {
policy->cur = cpufreq_driver->get(policy->cpu);
if (!policy->cur) {
+ ret = -EIO;
pr_err("%s: ->get() failed\n", __func__);
goto out_destroy_policy;
}
--
2.17.1

2020-11-26 17:11:24

by Rafael J. Wysocki

Subject: Re: [PATCH v2] cpufreq: Fix error return code in cpufreq_online()

On Thu, Nov 26, 2020 at 2:12 AM Wang ShaoBo <[email protected]> wrote:
>
> Fix to return proper error code instead of 0 in cpufreq_online(), as done
> elsewhere in this function.
>
> Signed-off-by: Wang ShaoBo <[email protected]>
> ---
> drivers/cpufreq/cpufreq.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> index 1e7e3f2ff09f..d3a28de35593 100644
> --- a/drivers/cpufreq/cpufreq.c
> +++ b/drivers/cpufreq/cpufreq.c
> @@ -1391,8 +1391,10 @@ static int cpufreq_online(unsigned int cpu)
>
> policy->min_freq_req = kzalloc(2 * sizeof(*policy->min_freq_req),
> GFP_KERNEL);
> - if (!policy->min_freq_req)
> + if (!policy->min_freq_req) {
> + ret = -ENOMEM;
> goto out_destroy_policy;
> + }
>
> ret = freq_qos_add_request(&policy->constraints,
> policy->min_freq_req, FREQ_QOS_MIN,
> @@ -1429,6 +1431,7 @@ static int cpufreq_online(unsigned int cpu)
> if (cpufreq_driver->get && has_target()) {
> policy->cur = cpufreq_driver->get(policy->cpu);
> if (!policy->cur) {
> + ret = -EIO;
> pr_err("%s: ->get() failed\n", __func__);
> goto out_destroy_policy;
> }
> --

Applied as 5.11 material with a modified subject and some changelog
edits, thanks!