diff options
| author |   Michael Walle <michael@walle.cc> | 2022-07-12 15:15:51 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-07-13 14:18:39 +0100 |
| commit | fc3dd0367e610ae20ebbce6c38c7b86c3a2cc07f (patch) | |
| tree | 07ec17aa50d365fabdaf4a14bcfd941d2b24161e /drivers/net/phy | |
| parent | net: ip6mr: add RTM_GETROUTE netlink op (diff) | |
| download | linux-dev-fc3dd0367e610ae20ebbce6c38c7b86c3a2cc07f.tar.xz linux-dev-fc3dd0367e610ae20ebbce6c38c7b86c3a2cc07f.zip | |
net: phy: mxl-gpy: fix version reporting
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>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/mxl-gpy.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/phy/mxl-gpy.c b/drivers/net/phy/mxl-gpy.c index 5b99acf44337..9728ef93fc0b 100644 --- a/drivers/net/phy/mxl-gpy.c +++ b/drivers/net/phy/mxl-gpy.c @@ -198,6 +198,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) { @@ -207,16 +208,16 @@ 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; ret = gpy_hwmon_register(phydev); if (ret) return ret; - 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; } |