aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter2019-05-03 15:50:24 +0300
committerDavid S. Miller2019-05-05 10:29:25 -0700
commit1ffc4b7c58e9eb505ea45a9ba2c5537c60de6eec (patch)
tree4fc08fb5033d99077aea55e8aa42e3da3916e3f4 /drivers
parentfdd1a8103a6df50bdeacd8bb04c3f6976cb9ae41 (diff)
net: ll_temac: Fix an NULL vs IS_ERR() check in temac_open()
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/xilinx/ll_temac_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index ca95c726269a..fff3baf824a9 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);
}