]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
reset: mchp: sparx5: fix return value check in mchp_sparx5_map_io()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 19 May 2021 14:16:37 +0000 (14:16 +0000)
committerPhilipp Zabel <p.zabel@pengutronix.de>
Mon, 7 Jun 2021 09:26:31 +0000 (11:26 +0200)
In case of error, the function devm_platform_get_and_ioremap_resource()
returns ERR_PTR() and never returns NULL. The NULL test in the return
value check should be replaced with IS_ERR().

Fixes: 453ed4283beb ("reset: mchp: sparx5: add switch reset driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20210519141638.3052456-1-weiyongjun1@huawei.com
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
drivers/reset/reset-microchip-sparx5.c

index cff39a643a14a0fcb422d440039d6f67381ad908..f01e7db8e83b06a00bb28a480c1f07cc393354c0 100644 (file)
@@ -82,9 +82,9 @@ static int mchp_sparx5_map_io(struct platform_device *pdev, int index,
        void __iomem *mem;
 
        mem = devm_platform_get_and_ioremap_resource(pdev, index, &res);
-       if (!mem) {
+       if (IS_ERR(mem)) {
                dev_err(&pdev->dev, "Could not map resource %d\n", index);
-               return -ENXIO;
+               return PTR_ERR(mem);
        }
        sparx5_reset_regmap_config.name = res->name;
        map = devm_regmap_init_mmio(&pdev->dev, mem, &sparx5_reset_regmap_config);