From 756a1d98193bc183ebfa7fe5858f6b94f2632503 Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 15 Dec 2017 16:13:06 +0000 Subject: net: dsa: allow init to continue when no phy Signed-off-by: Russell King --- net/dsa/slave.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 8022d50584db..84424ea40098 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -2271,7 +2271,8 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev) if (ret) { netdev_err(slave_dev, "failed to connect to PHY: %pe\n", ERR_PTR(ret)); - phylink_destroy(dp->pl); + ret = 0; +// phylink_destroy(dp->pl); } return ret; -- cgit