diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-03 13:02:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-03 13:02:29 +0100 |
| commit | e681a9d2050cdcaf24adeabc9f1aea6cff94be22 (patch) | |
| tree | 5dccb613fdadb3f792bfedc0c224581d1b3e7a73 /drivers/platform/mellanox/mlxbf-pmc.c | |
| parent | db3e8244bd1c46f5a416fd1e6821036ecc59884a (diff) | |
| parent | c9e6606c7fe92b50a02ce51dda82586ebdf99b48 (diff) | |
| download | linux-e681a9d2050cdcaf24adeabc9f1aea6cff94be22.tar.bz2 | |
Merge 5.16-rc8 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/mellanox/mlxbf-pmc.c')
| -rw-r--r-- | drivers/platform/mellanox/mlxbf-pmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/mellanox/mlxbf-pmc.c b/drivers/platform/mellanox/mlxbf-pmc.c index 04bc3b50aa7a..65b4a819f1bd 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) |