]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
net/mlxbf_gige: Fix an IS_ERR() vs NULL bug in mlxbf_gige_mdio_probe
authorPeng Wu <wupeng58@huawei.com>
Fri, 23 Sep 2022 02:36:40 +0000 (02:36 +0000)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 14 Nov 2022 10:25:34 +0000 (11:25 +0100)
BugLink: https://bugs.launchpad.net/bugs/1995517
[ Upstream commit 4774db8dfc6a2e6649920ebb2fc8e2f062c2080d ]

The devm_ioremap() function returns NULL on error, it doesn't return
error pointers.

Fixes: 3a1a274e933f ("mlxbf_gige: compute MDIO period based on i1clk")
Signed-off-by: Peng Wu <wupeng58@huawei.com>
Link: https://lore.kernel.org/r/20220923023640.116057-1-wupeng58@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c

index caa4380ada138deb4c003fc52ebaf30a3ccf46a9..5819584345ab8aa5a692465c6932b4ce7b09db1e 100644 (file)
@@ -244,8 +244,8 @@ int mlxbf_gige_mdio_probe(struct platform_device *pdev, struct mlxbf_gige *priv)
        }
 
        priv->clk_io = devm_ioremap(dev, res->start, resource_size(res));
-       if (IS_ERR(priv->clk_io))
-               return PTR_ERR(priv->clk_io);
+       if (!priv->clk_io)
+               return -ENOMEM;
 
        mlxbf_gige_mdio_cfg(priv);