commit 2141ad4a5f48a3895499253c6eaa6e110a378077
author Marek Behún <marek.behun@nic.cz> Thu Apr 07 00:33:05 2022 +0200
committer Ramon Fried <ramon@neureality.ai> Sun Apr 10 08:44:13 2022 +0300
tree 3dab8dbda4366c1619349f427efc8d2ba0f0a8d4
parent 8758453fa156782cf5834e6bb3be50e4cdcd94e2

net: phy: xilinx: Check interface type in ->config(), not ->probe()

We want to be able to have phydev->interface uninitialized during
->probe(). We should assume that phydev->interface is initialized only
before ->config().

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>

drivers/net/phy/xilinx_gmii2rgmii.c

diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index 635c057..d92a364 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -26,6 +26,11 @@
 
 	debug("%s\n", __func__);
 
+	if (phydev->interface != PHY_INTERFACE_MODE_GMII) {
+		printf("Incorrect interface type\n");
+		return -EINVAL;
+	}
+
 	if (!ofnode_valid(node))
 		return -EINVAL;
 
@@ -114,11 +119,6 @@
 {
 	debug("%s\n", __func__);
 
-	if (phydev->interface != PHY_INTERFACE_MODE_GMII) {
-		printf("Incorrect interface type\n");
-		return -EINVAL;
-	}
-
 	phydev->flags |= PHY_FLAG_BROKEN_RESET;
 
 	return 0;