| Message ID | 20160315071849.GH13560@mwanda |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 15/03/2016 08:18, Dan Carpenter wrote: > of_phy_connect() returns NULL on error, it never returns error pointers. > > Fixes: 656e705243fd ('net-next: mediatek: add support for MT7623 ethernet') > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > Acked-by: John Crispin <blogic@openwrt.org> Thanks ! > diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > index ba3afa5..9759fe5 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > @@ -186,9 +186,9 @@ static int mtk_phy_connect_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"); > - return PTR_ERR(phydev); > + return -ENODEV; > } > > dev_info(eth->dev, > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek >
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Tue, 15 Mar 2016 10:18:49 +0300 > of_phy_connect() returns NULL on error, it never returns error pointers. > > Fixes: 656e705243fd ('net-next: mediatek: add support for MT7623 ethernet') > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied.
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index ba3afa5..9759fe5 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -186,9 +186,9 @@ static int mtk_phy_connect_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"); - return PTR_ERR(phydev); + return -ENODEV; } dev_info(eth->dev,
of_phy_connect() returns NULL on error, it never returns error pointers. Fixes: 656e705243fd ('net-next: mediatek: add support for MT7623 ethernet') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>