From: Dan Carpenter <dan.carpenter@linaro.org>
Date: Tue, 6 Jun 2023 08:22:42 +0000 (+0300)
Subject: powercap: RAPL: Fix a NULL vs IS_ERR() bug
X-Git-Tag: v6.5-rc1~212^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49776c712eb6ded12fcbb8cc915a498dbfb47311;p=thirdparty%2Fkernel%2Flinux.git

powercap: RAPL: Fix a NULL vs IS_ERR() bug

The devm_ioremap_resource() function returns error pointers on error,
it never returns NULL.  Update the check accordingly.

Fixes: 9eef7f9da928 ("powercap: intel_rapl: Introduce RAPL TPMI interface driver")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c
index c016127b34976..4f4f13ded225c 100644
--- a/drivers/powercap/intel_rapl_tpmi.c
+++ b/drivers/powercap/intel_rapl_tpmi.c
@@ -255,8 +255,8 @@ static int intel_rapl_tpmi_probe(struct auxiliary_device *auxdev,
 	}
 
 	trp->base = devm_ioremap_resource(&auxdev->dev, res);
-	if (!trp->base) {
-		ret = -ENOMEM;
+	if (IS_ERR(trp->base)) {
+		ret = PTR_ERR(trp->base);
 		goto err;
 	}