Skip to content

Commit

Permalink
net: phy: marvell10g: fix return value on error
Browse files Browse the repository at this point in the history
[ Upstream commit 0ed9704 ]

Return back the error value that we get from phy_read_mmd().

Fixes: c84786f ("net: phy: marvell10g: read copper results from CSSR1")
Signed-off-by: Baruch Siach <baruch.siach@siklu.com>
Reviewed-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/f47cb031aeae873bb008ba35001607304a171a20.1650868058.git.baruch@tkos.co.il
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Baruch Siach authored and gregkh committed May 9, 2022
1 parent b7d15a4 commit be0cfea
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/phy/marvell10g.c
Expand Up @@ -880,7 +880,7 @@ static int mv3310_read_status_copper(struct phy_device *phydev)

cssr1 = phy_read_mmd(phydev, MDIO_MMD_PCS, MV_PCS_CSSR1);
if (cssr1 < 0)
return val;
return cssr1;

/* If the link settings are not resolved, mark the link down */
if (!(cssr1 & MV_PCS_CSSR1_RESOLVED)) {
Expand Down

0 comments on commit be0cfea

Please sign in to comment.