From: Vladimir Oltean <vladimir.oltean@nxp.com>
Date: Mon, 24 May 2021 09:25:25 +0000 (+0300)
Subject: net: dsa: sja1105: error out on unsupported PHY mode
X-Git-Tag: v5.4.124~96
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e00da6510b3bdf6129f0c38508e2d9e594feb730;p=users%2Fdwmw2%2Flinux.git

net: dsa: sja1105: error out on unsupported PHY mode

commit 6729188d2646709941903052e4b78e1d82c239b9 upstream.

The driver continues probing when a port is configured for an
unsupported PHY interface type, instead it should stop.

Fixes: 8aa9ebccae87 ("net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index 3b51e87a3714a..034f1b50ab287 100644
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -178,6 +178,7 @@ static int sja1105_init_mii_settings(struct sja1105_private *priv,
 		default:
 			dev_err(dev, "Unsupported PHY mode %s!\n",
 				phy_modes(ports[i].phy_mode));
+			return -EINVAL;
 		}
 
 		mii->phy_mac[i] = ports[i].role;