diff mbox series

[-next] cpufreq: qcom-hw: Fix return value check in qcom_cpufreq_hw_cpu_init()

Message ID 20210304100423.3856265-1-weiyongjun1@huawei.com
State Accepted
Commit 536eb97abeba857126ad055de5923fa592acef25
Headers show
Series [-next] cpufreq: qcom-hw: Fix return value check in qcom_cpufreq_hw_cpu_init() | expand

Commit Message

Wei Yongjun March 4, 2021, 10:04 a.m. UTC 
From: Wei Yongjun <weiyongjun1@huawei.com>

In case of error, the function ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.

Fixes: 67fc209b527d ("cpufreq: qcom-hw: drop devm_xxx() calls from init/exit hooks")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 drivers/cpufreq/qcom-cpufreq-hw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Viresh Kumar March 5, 2021, 9:32 a.m. UTC | #1 
On 04-03-21, 18:42, Shawn Guo wrote:
> On Thu, Mar 4, 2021 at 5:55 PM 'Wei Yongjun <weiyongjun1@huawei.com> wrote:
> >
> > From: Wei Yongjun <weiyongjun1@huawei.com>
> >
> > In case of error, the function ioremap() returns NULL pointer
> > not ERR_PTR(). The IS_ERR() test in the return value check
> > should be replaced with NULL test.
> >
> > Fixes: 67fc209b527d ("cpufreq: qcom-hw: drop devm_xxx() calls from init/exit hooks")
> > Reported-by: Hulk Robot <hulkci@huawei.com>
> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> 
> Acked-by: Shawn Guo <shawn.guo@linaro.org>

Applied. Thanks.
diff mbox series

Patch

diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c
index d3c23447b892..6e59ec4fb564 100644
--- a/drivers/cpufreq/qcom-cpufreq-hw.c
+++ b/drivers/cpufreq/qcom-cpufreq-hw.c
@@ -317,9 +317,9 @@  static int qcom_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
 	}
 
 	base = ioremap(res->start, resource_size(res));
-	if (IS_ERR(base)) {
+	if (!base) {
 		dev_err(dev, "failed to map resource %pR\n", res);
-		ret = PTR_ERR(base);
+		ret = -ENOMEM;
 		goto release_region;
 	}