Commit 9234a254 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jakub Kicinski
Browse files

net: phy: bcm84881: Fix some error handling paths 



If phy_read_mmd() fails, the error code stored in 'bmsr' should be returned
instead of 'val' which is likely to be 0.

Fixes: 75f4d8d1 ("net: phy: add Broadcom BCM84881 PHY driver")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://patch.msgid.link/3e1755b0c40340d00e089d6adae5bca2f8c79e53.1727982168.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1dae9f11

drivers/net/phy/bcm84881.c

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int bcm84881_aneg_done(struct phy_device *phydev) 


	bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR);

	if (bmsr < 0)

		return val;

		return bmsr;



	return !!(val & MDIO_AN_STAT1_COMPLETE) &&

	       !!(bmsr & BMSR_ANEGCOMPLETE);
@@ -158,7 +158,7 @@ static int bcm84881_read_status(struct phy_device *phydev) 


	bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR);

	if (bmsr < 0)

		return val;

		return bmsr;



	phydev->autoneg_complete = !!(val & MDIO_AN_STAT1_COMPLETE) &&

				   !!(bmsr & BMSR_ANEGCOMPLETE);