aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/altera
diff options
context:
space:
mode:
authorAtsushi Nemoto <atsushi.nemoto@sord.co.jp>2019-01-21 17:26:41 +0900
committerDavid S. Miller <davem@davemloft.net>2019-01-22 17:44:57 -0800
commit17b42a20d7ca59377788c6a2409e77569570cc10 (patch)
tree7385866f2eb5edd4efd62ce2e7853fe363a5baac /drivers/net/ethernet/altera
parent5d9bf43357d5b0ef386bcaa2cafb94898364ff7d (diff)
downloadlinux-17b42a20d7ca59377788c6a2409e77569570cc10.tar.gz
net: altera_tse: fix connect_local_phy error path
The connect_local_phy should return NULL (not negative errno) on error, since its caller expects it. Signed-off-by: Atsushi Nemoto <atsushi.nemoto@sord.co.jp> Acked-by: Thor Thayer <thor.thayer@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/altera')
-rw-r--r--drivers/net/ethernet/altera/altera_tse_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
index 02921d877c08..aa1d1f5339d2 100644
--- a/drivers/net/ethernet/altera/altera_tse_main.c
+++ b/drivers/net/ethernet/altera/altera_tse_main.c
@@ -714,8 +714,10 @@ static struct phy_device *connect_local_phy(struct net_device *dev)
phydev = phy_connect(dev, phy_id_fmt, &altera_tse_adjust_link,
priv->phy_iface);
- if (IS_ERR(phydev))
+ if (IS_ERR(phydev)) {
netdev_err(dev, "Could not attach to PHY\n");
+ phydev = NULL;
+ }
} else {
int ret;