]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
powercap: RAPL: Fix a NULL vs IS_ERR() bug
authorDan Carpenter <dan.carpenter@linaro.org>
Tue, 6 Jun 2023 08:22:42 +0000 (11:22 +0300)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 12 Jun 2023 17:51:21 +0000 (19:51 +0200)
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>
drivers/powercap/intel_rapl_tpmi.c

index c016127b349761106e9b587156c2dd17ece3ada6..4f4f13ded225c4f33f1933f1598cf0ca5914840a 100644 (file)
@@ -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;
        }