]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
platform/mellanox: mlxbf-pmc: Fix an IS_ERR() vs NULL bug in mlxbf_pmc_map_counters
authorMiaoqian Lin <linmq006@gmail.com>
Fri, 10 Dec 2021 07:07:53 +0000 (07:07 +0000)
committerHans de Goede <hdegoede@redhat.com>
Tue, 21 Dec 2021 18:35:22 +0000 (19:35 +0100)
The devm_ioremap() function returns NULL on error, it doesn't return
error pointers. Also according to doc of device_property_read_u64_array,
values in info array are properties of device or NULL.

Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Link: https://lore.kernel.org/r/20211210070753.10761-1-linmq006@gmail.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
drivers/platform/mellanox/mlxbf-pmc.c

index 04bc3b50aa7a4ddc7724e514a0194403696bde66..65b4a819f1bdf85f49bc7ab61eb918f0bc06bc86 100644 (file)
@@ -1374,8 +1374,8 @@ static int mlxbf_pmc_map_counters(struct device *dev)
                pmc->block[i].counters = info[2];
                pmc->block[i].type = info[3];
 
-               if (IS_ERR(pmc->block[i].mmio_base))
-                       return PTR_ERR(pmc->block[i].mmio_base);
+               if (!pmc->block[i].mmio_base)
+                       return -ENOMEM;
 
                ret = mlxbf_pmc_create_groups(dev, i);
                if (ret)