提交 8b3ff414 编写于 作者: B Baruch Siach 提交者: Zheng Zengkai

net: phy: marvell10g: fix return value on error

stable inclusion
from stable-v5.10.114
commit 1204386e2657b5aa942d21aff353a84bea84f5b7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5IY1V

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=1204386e2657b5aa942d21aff353a84bea84f5b7

--------------------------------

[ Upstream commit 0ed9704b ]

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

Fixes: c84786fa ("net: phy: marvell10g: read copper results from CSSR1")
Signed-off-by: NBaruch Siach <baruch.siach@siklu.com>
Reviewed-by: NMarek Behún <kabel@kernel.org>
Reviewed-by: NRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/f47cb031aeae873bb008ba35001607304a171a20.1650868058.git.baruch@tkos.co.ilSigned-off-by: NPaolo Abeni <pabeni@redhat.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 686467e6
...@@ -650,7 +650,7 @@ static int mv3310_read_status_copper(struct phy_device *phydev) ...@@ -650,7 +650,7 @@ static int mv3310_read_status_copper(struct phy_device *phydev)
cssr1 = phy_read_mmd(phydev, MDIO_MMD_PCS, MV_PCS_CSSR1); cssr1 = phy_read_mmd(phydev, MDIO_MMD_PCS, MV_PCS_CSSR1);
if (cssr1 < 0) if (cssr1 < 0)
return val; return cssr1;
/* If the link settings are not resolved, mark the link down */ /* If the link settings are not resolved, mark the link down */
if (!(cssr1 & MV_PCS_CSSR1_RESOLVED)) { if (!(cssr1 & MV_PCS_CSSR1_RESOLVED)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册