Skip to content

Commit 23c2b22

Browse files
committed
Revert "net: phy: as21: fix mt7988 phy led by not overwriting phydev->phy_id with 0"
This reverts commit 581cfd2.
1 parent 581cfd2 commit 23c2b22

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/net/phy/as21xxx/as21xxx.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,9 +1527,7 @@ static int aeon_gen1_match_phy_device(struct phy_device *phydev,
15271527
return phy_id == phydrv->phy_id;
15281528
}
15291529

1530-
if (phy_id)
1531-
phydev->phy_id = phy_id;
1532-
1530+
phydev->phy_id = phy_id;
15331531
aeon_cl45_write(phydev, MDIO_MMD_VEND1, VEND1_PTP_CLK, 0x48);
15341532
if (phydrv->phy_id == PHY_ID_AS21XXX)
15351533
aeon_dbg(phydev,
@@ -1553,9 +1551,7 @@ static int aeon_gen2_match_phy_device(struct phy_device *phydev,
15531551
return ret;
15541552
}
15551553

1556-
if (phy_id)
1557-
phydev->phy_id = phy_id;
1558-
1554+
phydev->phy_id = phy_id;
15591555
aeon_dbg(phydev, "gen2 match: read PHY ID=0x%08x, trying driver=%s (0x%08x)\n",
15601556
phy_id, phydrv->name, phydrv->phy_id);
15611557
if (phy_id == phydrv->phy_id)

0 commit comments

Comments
 (0)