[openwrt/openwrt] staging: mt7621-eth: fix return value check in mtk_connect_phy_node()

LEDE Commits lede-commits at lists.infradead.org
Mon May 14 21:52:58 PDT 2018


blogic pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/edec25187008e2e7893858f871369f9d6a0157e0

commit edec25187008e2e7893858f871369f9d6a0157e0
Author: Wei Yongjun <weiyongjun1 at huawei.com>
AuthorDate: Mon May 14 11:14:24 2018 -0700

    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 <weiyongjun1 at huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 target/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 b2a3158..bdfdf7a 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;



More information about the lede-commits mailing list