iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: phy: mxl-gpy: fix version reporting

Browse Source 
[ Upstream commit fc3dd0367e610ae20ebbce6c38c7b86c3a2cc07f ]

The commit 09ce6b20103b ("net: phy: mxl-gpy: add temperature sensor")
will overwrite the return value and the reported version will be wrong.
Fix it.

Fixes: 09ce6b20103b ("net: phy: mxl-gpy: add temperature sensor")
Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: 5f4d487d01ff ("net: phy: mxl-gpy: add MDINT workaround")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Michael Walle 2022-07-12 15:15:51 +02:00 committed by Greg Kroah-Hartman
parent dec5abd91a
commit b08412a9cf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/phy/mxl-gpy.c
View File

@ -96,6 +96,7 @@ static int gpy_config_init(struct phy_device *phydev)
static int gpy_probe(struct phy_device *phydev)
{
int fw_version;
int ret;
if (!phydev->is_c45) {
@ -105,12 +106,12 @@ static int gpy_probe(struct phy_device *phydev)
}
/* Show GPY PHY FW version in dmesg */
ret = phy_read(phydev, PHY_FWV);
if (ret < 0)
return ret;
fw_version = phy_read(phydev, PHY_FWV);
if (fw_version < 0)
return fw_version;
phydev_info(phydev, "Firmware Version: 0x%04X (%s)\n", ret,
(ret & PHY_FWV_REL_MASK) ? "release" : "test");
phydev_info(phydev, "Firmware Version: 0x%04X (%s)\n", fw_version,
(fw_version & PHY_FWV_REL_MASK) ? "release" : "test");
return 0;
}