net: phy: as21: fix phy-id overwrite for all phys (breaking leds on mt7988 internal 1G phy)

frank-w · frank-w · commit 4af7689a71cf · 2026-02-12T17:11:46.000+01:00
diff --git a/drivers/net/phy/as21xxx.c b/drivers/net/phy/as21xxx.c
@@ -1236,10 +1236,11 @@ static int as21xxx_config_led(struct phy_device *phydev)
 static int as21xxx_match_phy_device(struct phy_device *phydev,
 				    const struct phy_driver *phydrv)
 {
+	u32 phy_id = aeon_read_pid(phydev);
 	/* AEONSEMI get pid. */
-	phydev->phy_id = aeon_read_pid(phydev);
-	if (phydev->phy_id != PHY_ID_AS21XXX)
+	if (phy_id != PHY_ID_AS21XXX)
 		return 0;
+	phydev->phy_id = phy_id;
 	aeon_mdio_write(phydev, 0x1E, 0x142, 0x48);
 	return 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -1236,10 +1236,11 @@ static int as21xxx_config_led(struct phy_device *phydev)`
`1236`	`1236`	`static int as21xxx_match_phy_device(struct phy_device *phydev,`
`1237`	`1237`	`const struct phy_driver *phydrv)`
`1238`	`1238`	`{`
	`1239`	`+ u32 phy_id = aeon_read_pid(phydev);`
`1239`	`1240`	`/* AEONSEMI get pid. */`
`1240`		`- phydev->phy_id = aeon_read_pid(phydev);`
`1241`		`- if (phydev->phy_id != PHY_ID_AS21XXX)`
	`1241`	`+ if (phy_id != PHY_ID_AS21XXX)`
`1242`	`1242`	`return 0;`
	`1243`	`+ phydev->phy_id = phy_id;`
`1243`	`1244`	`aeon_mdio_write(phydev, 0x1E, 0x142, 0x48);`
`1244`	`1245`	`return 1;`
`1245`	`1246`	`}`