summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaruch Siach <baruch.siach@siklu.com>2022-04-25 09:27:38 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-05-09 09:16:24 +0200
commitbe0cfea41f4aa7d952d0d275d24aba0938eff39b (patch)
treeb35b322d9a74cf3a400b0af00fb0451912a0d962
parentb7d15a413848a84a73e00677f164a698aa78b513 (diff)
net: phy: marvell10g: fix return value on error
[ Upstream commit 0ed9704b660b259b54743cad8a84a11148f60f0a ] Return back the error value that we get from phy_read_mmd(). Fixes: c84786fa8f91 ("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>
-rw-r--r--drivers/net/phy/marvell10g.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index b6fea119fe13..2b7d0720720b 100644
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -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)) {