Commit 18b37b6b authored Jan 21, 2019 by Atsushi Nemoto Committed by Greg Kroah-Hartman Mar 05, 2019

net: altera_tse: fix connect_local_phy error path



[ Upstream commit 17b42a20d7ca59377788c6a2409e77569570cc10 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent b7d012ec

drivers/net/ethernet/altera/altera_tse_main.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -692,8 +692,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;