Commit ad74456b authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Greg Kroah-Hartman

net: altera_tse: fix connect_local_phy error path

[ Upstream commit 17b42a20 ]

The connect_local_phy should return NULL (not negative errno) on
error, since its caller expects it.
Signed-off-by: default avatarAtsushi Nemoto <atsushi.nemoto@sord.co.jp>
Acked-by: default avatarThor Thayer <thor.thayer@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9de38811
...@@ -714,8 +714,10 @@ static struct phy_device *connect_local_phy(struct net_device *dev) ...@@ -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, phydev = phy_connect(dev, phy_id_fmt, &altera_tse_adjust_link,
priv->phy_iface); priv->phy_iface);
if (IS_ERR(phydev)) if (IS_ERR(phydev)) {
netdev_err(dev, "Could not attach to PHY\n"); netdev_err(dev, "Could not attach to PHY\n");
phydev = NULL;
}
} else { } else {
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment