Commit fc3dd036 authored by Michael Walle's avatar Michael Walle Committed by David S. Miller
Browse files

net: phy: mxl-gpy: fix version reporting 



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

Fixes: 09ce6b20 ("net: phy: mxl-gpy: add temperature sensor")
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7c31cbd

drivers/net/phy/mxl-gpy.c

+6 −5
Original line number Diff line number Diff line
@@ -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;

}