Message ID | f47cb031aeae873bb008ba35001607304a171a20.1650868058.git.baruch@tkos.co.il (mailing list archive) |
---|---|
State | Accepted |
Commit | 0ed9704b660b259b54743cad8a84a11148f60f0a |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | net: phy: marvell10g: fix return value on error | expand |
On Mon, 25 Apr 2022 09:27:38 +0300 Baruch Siach <baruch@tkos.co.il> wrote: > From: Baruch Siach <baruch.siach@siklu.com> > > 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>
On Mon, Apr 25, 2022 at 09:27:38AM +0300, Baruch Siach wrote: > From: Baruch Siach <baruch.siach@siklu.com> > > 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: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Thanks!
Hello: This patch was applied to netdev/net.git (master) by Paolo Abeni <pabeni@redhat.com>: On Mon, 25 Apr 2022 09:27:38 +0300 you wrote: > From: Baruch Siach <baruch.siach@siklu.com> > > 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> > > [...] Here is the summary with links: - net: phy: marvell10g: fix return value on error https://git.kernel.org/netdev/net/c/0ed9704b660b You are awesome, thank you!
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)) {