[<prev] [next>] [day] [month] [year] [list]
Message-ID: <1521684591-77182-1-git-send-email-weiyongjun1@huawei.com>
Date: Thu, 22 Mar 2018 02:09:51 +0000
From: Wei Yongjun <weiyongjun1@...wei.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
John Crispin <blogic@...nwrt.org>,
Michael Lee <igvtee@...il.com>, NeilBrown <neil@...wn.name>,
Felix Fietkau <nbd@...nwrt.org>
CC: Wei Yongjun <weiyongjun1@...wei.com>, <devel@...verdev.osuosl.org>,
<linux-kernel@...r.kernel.org>, <kernel-janitors@...r.kernel.org>
Subject: [PATCH -next] 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@...wei.com>
---
drivers/staging/mt7621-eth/mdio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/mt7621-eth/mdio.c b/drivers/staging/mt7621-eth/mdio.c
index 96ecda9..9d71307 100644
--- a/drivers/staging/mt7621-eth/mdio.c
+++ b/drivers/staging/mt7621-eth/mdio.c
@@ -82,10 +82,10 @@ int mtk_connect_phy_node(struct mtk_eth *eth, struct mtk_mac *mac,
phydev = of_phy_connect(eth->netdev[mac->id], phy_node,
mtk_phy_link_adjust, 0, phy_mode);
- if (IS_ERR(phydev)) {
+ if (!phydev) {
dev_err(eth->dev, "could not connect to PHY\n");
eth->phy->phy_node[port] = NULL;
- return PTR_ERR(phydev);
+ return -ENODEV;
}
phydev->supported &= PHY_GBIT_FEATURES;
Powered by blists - more mailing lists