2020-03-17 00:30:08

by Jeffy Chen

[permalink] [raw]
Subject: [PATCH] arch_topology: Fix putting invalid cpu clk

Add a sanity check before putting the cpu clk.

Fixes: 2a6d1c6bcd1f (“arch_topology: Adjust initial CPU capacities with current freq")
Signed-off-by: Jeffy Chen <[email protected]>
---

drivers/base/arch_topology.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 8a9fe2bc8635..4d0a0038b476 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -176,11 +176,11 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)
* frequency (by keeping the initial freq_factor value).
*/
cpu_clk = of_clk_get(cpu_node, 0);
- if (!PTR_ERR_OR_ZERO(cpu_clk))
+ if (!PTR_ERR_OR_ZERO(cpu_clk)) {
per_cpu(freq_factor, cpu) =
clk_get_rate(cpu_clk) / 1000;
-
- clk_put(cpu_clk);
+ clk_put(cpu_clk);
+ }
} else {
if (raw_capacity) {
pr_err("cpu_capacity: missing %pOF raw capacity\n",
--
2.11.0




2020-03-17 06:24:51

by Sudeep Holla

[permalink] [raw]
Subject: Re: [PATCH] arch_topology: Fix putting invalid cpu clk

On Tue, Mar 17, 2020 at 08:18:29AM +0800, Jeffy Chen wrote:
> Add a sanity check before putting the cpu clk.
>
> Fixes: 2a6d1c6bcd1f (“arch_topology: Adjust initial CPU capacities with current freq")

Fixing a non-existent commit ?

--
Regards,
Sudeep

2020-03-17 06:36:19

by Jeffy Chen

[permalink] [raw]
Subject: Re: [PATCH] arch_topology: Fix putting invalid cpu clk

Hi Sudeep,

On 03/17/2020 02:24 PM, Sudeep Holla wrote:
> On Tue, Mar 17, 2020 at 08:18:29AM +0800, Jeffy Chen wrote:
>> Add a sanity check before putting the cpu clk.
>>
>> Fixes: 2a6d1c6bcd1f (“arch_topology: Adjust initial CPU capacities with current freq")
>
> Fixing a non-existent commit ?
>
Sorry, wrong commit id, will resend it soon.

> --
> Regards,
> Sudeep
>



2020-03-17 06:37:53

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH] arch_topology: Fix putting invalid cpu clk

On Tue, Mar 17, 2020 at 08:18:29AM +0800, Jeffy Chen wrote:
> Add a sanity check before putting the cpu clk.
>
> Fixes: 2a6d1c6bcd1f (“arch_topology: Adjust initial CPU capacities with current freq")

Don't you mean:
Fixes: b8fe128dad8f ("arch_topology: Adjust initial CPU capacities with current freq")