0065-net-mediatek-checking-for-IS_ERR-instead-of-NULL.patch 1.1 KB

1234567891011121314151617181920212223242526272829303132
  1. From 56b33ebf188a59d8307c3b748eccf8cda1062981 Mon Sep 17 00:00:00 2001
  2. From: Dan Carpenter <[email protected]>
  3. Date: Tue, 15 Mar 2016 10:18:49 +0300
  4. Subject: [PATCH 65/90] net: mediatek: checking for IS_ERR() instead of NULL
  5. of_phy_connect() returns NULL on error, it never returns error pointers.
  6. Fixes: 656e705243fd ('net-next: mediatek: add support for MT7623 ethernet')
  7. Signed-off-by: Dan Carpenter <[email protected]>
  8. ---
  9. drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++--
  10. 1 file changed, 2 insertions(+), 2 deletions(-)
  11. diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  12. index ba3afa5..9759fe5 100644
  13. --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  14. +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  15. @@ -186,9 +186,9 @@ static int mtk_phy_connect_node(struct mtk_eth *eth, struct mtk_mac *mac,
  16. phydev = of_phy_connect(eth->netdev[mac->id], phy_node,
  17. mtk_phy_link_adjust, 0, phy_mode);
  18. - if (IS_ERR(phydev)) {
  19. + if (!phydev) {
  20. dev_err(eth->dev, "could not connect to PHY\n");
  21. - return PTR_ERR(phydev);
  22. + return -ENODEV;
  23. }
  24. dev_info(eth->dev,
  25. --
  26. 1.7.10.4