summaryrefslogtreecommitdiff
path: root/drivers/perf
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@linaro.org>2024-09-11 10:39:59 +0300
committerWill Deacon <will@kernel.org>2024-09-12 12:49:33 +0100
commit2e091a805febb9a91cc7de2735d8d4ef0e640241 (patch)
tree90703f02bc3967a34f55ca34c0ca6db5202639eb /drivers/perf
parent5967a19f1c2ffb530f5d4589ddc4b4afbb6c7bd4 (diff)
downloadlwn-2e091a805febb9a91cc7de2735d8d4ef0e640241.tar.gz
lwn-2e091a805febb9a91cc7de2735d8d4ef0e640241.zip
perf: arm-ni: Fix an NULL vs IS_ERR() bug
The devm_ioremap() function never returns error pointers, it returns a NULL pointer if there is an error. Fixes: 4d5a7680f2b4 ("perf: Add driver for Arm NI-700 interconnect PMU") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Robin Murphy <robin.murphy@arm.com> Link: https://lore.kernel.org/r/04d6ccc3-6d31-4f0f-ab0f-7a88342cc09a@stanley.mountain Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'drivers/perf')
-rw-r--r--drivers/perf/arm-ni.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/perf/arm-ni.c b/drivers/perf/arm-ni.c
index b72df3aea93e..90fcfe693439 100644
--- a/drivers/perf/arm-ni.c
+++ b/drivers/perf/arm-ni.c
@@ -603,8 +603,8 @@ static int arm_ni_probe(struct platform_device *pdev)
*/
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
- if (IS_ERR(base))
- return PTR_ERR(base);
+ if (!base)
+ return -ENOMEM;
arm_ni_probe_domain(base, &cfg);
if (cfg.type != NI_GLOBAL)