diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2021-03-04 10:04:23 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-17 17:06:33 +0100 |
| commit | e50ada589497a0b5cf8eba3ecdf001ad5603a5fe (patch) | |
| tree | aa33b00bf295d3e82deeec986b80183d666e3c0e /drivers/cpufreq | |
| parent | 7dfe37e9ea6985c932b2d4fd5ba67b889b453488 (diff) | |
| download | linux-stable-e50ada589497a0b5cf8eba3ecdf001ad5603a5fe.tar.gz linux-stable-e50ada589497a0b5cf8eba3ecdf001ad5603a5fe.tar.bz2 linux-stable-e50ada589497a0b5cf8eba3ecdf001ad5603a5fe.zip | |
cpufreq: qcom-hw: Fix return value check in qcom_cpufreq_hw_cpu_init()
[ Upstream commit 536eb97abeba857126ad055de5923fa592acef25 ]
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>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/qcom-cpufreq-hw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c index 5cdd20e38771..6de07556665b 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; } |