projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21bf1dc
)
net: phy: marvell10g: fix return value on error
author
Baruch Siach
<baruch.siach@siklu.com>
Mon, 25 Apr 2022 06:27:38 +0000
(09:27 +0300)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 9 May 2022 07:14:37 +0000
(09:14 +0200)
[ 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>
drivers/net/phy/marvell10g.c
patch
|
blob
|
history
diff --git
a/drivers/net/phy/marvell10g.c
b/drivers/net/phy/marvell10g.c
index bd310e8d5e43d106a2a2d6208200c79c6c54c26e..df33637c5269ac379e0d25c917f1a93ba73c08d4 100644
(file)
--- a/
drivers/net/phy/marvell10g.c
+++ b/
drivers/net/phy/marvell10g.c
@@
-789,7
+789,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)) {