From: Wei Yongjun Date: Wed, 10 Oct 2018 02:00:24 +0000 (+0000) Subject: phy: phy-ocelot-serdes: fix return value check in serdes_probe() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9047fa5d32942acbc017d2c2e2d0af3e6ce833ed;p=openwrt%2Fstaging%2Fblogic.git phy: phy-ocelot-serdes: fix return value check in serdes_probe() In case of error, the function syscon_node_to_regmap() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: 51f6b410fc22 ("phy: add driver for Microsemi Ocelot SerDes muxing") Signed-off-by: Wei Yongjun Reviewed-by: Quentin Schulz Signed-off-by: David S. Miller --- diff --git a/drivers/phy/mscc/phy-ocelot-serdes.c b/drivers/phy/mscc/phy-ocelot-serdes.c index 8936abd22f0f..b2be54680cf7 100644 --- a/drivers/phy/mscc/phy-ocelot-serdes.c +++ b/drivers/phy/mscc/phy-ocelot-serdes.c @@ -257,8 +257,8 @@ static int serdes_probe(struct platform_device *pdev) ctrl->dev = &pdev->dev; ctrl->regs = syscon_node_to_regmap(pdev->dev.parent->of_node); - if (!ctrl->regs) - return -ENODEV; + if (IS_ERR(ctrl->regs)) + return PTR_ERR(ctrl->regs); for (i = 0; i <= SERDES_MAX; i++) { ret = serdes_phy_create(ctrl, i, &ctrl->phys[i]);