| Message ID | 20190503125024.GF29695@mwanda |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [1/2,net-next] net: ll_temac: Fix an NULL vs IS_ERR() check in temac_open() | expand |
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Fri, 3 May 2019 15:50:24 +0300 > The phy_connect() function doesn't return NULL pointers. It returns > error pointers on error, so I have updated the check. > > Fixes: 8425c41d1ef7 ("net: ll_temac: Extend support to non-device-tree platforms") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied.
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 1003ee14c833..bcb97fbf5b54 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -927,9 +927,9 @@ static int temac_open(struct net_device *ndev) } else if (strlen(lp->phy_name) > 0) { phydev = phy_connect(lp->ndev, lp->phy_name, temac_adjust_link, lp->phy_interface); - if (!phydev) { + if (IS_ERR(phydev)) { dev_err(lp->dev, "phy_connect() failed\n"); - return -ENODEV; + return PTR_ERR(phydev); } phy_start(phydev); }
The phy_connect() function doesn't return NULL pointers. It returns error pointers on error, so I have updated the check. Fixes: 8425c41d1ef7 ("net: ll_temac: Extend support to non-device-tree platforms") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)