]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: ethernet: adi: Fix return value check in adin1110_probe_netdevs()
authorWei Yongjun <weiyongjun1@huawei.com>
Thu, 22 Sep 2022 02:10:23 +0000 (02:10 +0000)
committerJakub Kicinski <kuba@kernel.org>
Mon, 26 Sep 2022 19:44:40 +0000 (12:44 -0700)
In case of error, the function get_phy_device() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Fixes: 40a42b62cfa9 ("net: ethernet: adi: Add ADIN1110 support")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20220922021023.811581-1-weiyongjun@huaweicloud.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/adi/adin1110.c

index 4f3c372292f3092e43446db7c2997e8e328c3a88..2de0ba95fb2ccce41cc7d781292611d0b31e9759 100644 (file)
@@ -1582,9 +1582,9 @@ static int adin1110_probe_netdevs(struct adin1110_priv *priv)
                netdev->features |= NETIF_F_NETNS_LOCAL;
 
                port_priv->phydev = get_phy_device(priv->mii_bus, i + 1, false);
-               if (!port_priv->phydev) {
+               if (IS_ERR(port_priv->phydev)) {
                        netdev_err(netdev, "Could not find PHY with device address: %d.\n", i);
-                       return -ENODEV;
+                       return PTR_ERR(port_priv->phydev);
                }
 
                port_priv->phydev = phy_connect(netdev,