summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-12-15 16:13:06 +0000
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2022-06-21 10:58:03 +0100
commit756a1d98193bc183ebfa7fe5858f6b94f2632503 (patch)
treea46df1e7ba0c2b67dcb766c39033392cd0b5ba86
parent793c5fb61059ce1132fdfa7b25ac58813e5f403b (diff)
net: dsa: allow init to continue when no phy
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--net/dsa/slave.c3
1 files changed, 2 insertions, 1 deletions
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;