aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiaoqian Lin <linmq006@gmail.com>2021-12-10 07:07:53 +0000
committerHans de Goede <hdegoede@redhat.com>2021-12-21 19:35:22 +0100
commit804034c4ffc502795cea9b3867acb2ec7fad99ba (patch)
tree873cbf9d462bbbe8ffead21112196b17a8812170
parent7d0c009043f6a970f62dbf5aecda9f8c3ccafcff (diff)
downloadslab-804034c4ffc502795cea9b3867acb2ec7fad99ba.tar.gz
platform/mellanox: mlxbf-pmc: Fix an IS_ERR() vs NULL bug in mlxbf_pmc_map_counters
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>
-rw-r--r--drivers/platform/mellanox/mlxbf-pmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/mellanox/mlxbf-pmc.c b/drivers/platform/mellanox/mlxbf-pmc.c
index 04bc3b50aa7a4d..65b4a819f1bdf8 100644
--- a/drivers/platform/mellanox/mlxbf-pmc.c
+++ b/drivers/platform/mellanox/mlxbf-pmc.c
@@ -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)