net: phy: mxl-gpy: fix version reporting

[ 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>
(cherry picked from commit b08412a9cf265bbe616262566f34533ab75d0d34)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/drivers/net/phy/mxl-gpy.c b/drivers/net/phy/mxl-gpy.c
index 5ce1bf03bbd71a11a094c387820bc0bd813f45ae..f9c70476d7e8cdaf700c43b8a1fd1b0e3a9eec2b 100644 (file)
--- a/drivers/net/phy/mxl-gpy.c
+++ b/drivers/net/phy/mxl-gpy.c
@@ -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;
 }