From edec25187008e2e7893858f871369f9d6a0157e0 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 14 May 2018 11:14:24 -0700 Subject: [PATCH] staging: mt7621-eth: fix return value check in mtk_connect_phy_node() In case of error, the function of_phy_connect() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: e3cbf478f846 ("staging: mt7621-eth: add the drivers core files") Signed-off-by: Wei Yongjun Signed-off-by: Greg Kroah-Hartman --- .../linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio.c index b2a31589bc..bdfdf7a432 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio.c +++ b/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/mdio.c @@ -82,10 +82,10 @@ int fe_connect_phy_node(struct fe_priv *priv, struct device_node *phy_node) phydev = of_phy_connect(priv->netdev, phy_node, fe_phy_link_adjust, 0, phy_mode); - if (IS_ERR(phydev)) { + if (!phydev) { dev_err(priv->dev, "could not connect to PHY\n"); priv->phy->phy_node[port] = NULL; - return PTR_ERR(phydev); + return -ENODEV; } phydev->supported &= PHY_GBIT_FEATURES; -- 2.30.2