]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: phy: marvell10g: fix return value on error
authorBaruch Siach <baruch.siach@siklu.com>
Mon, 25 Apr 2022 06:27:38 +0000 (09:27 +0300)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 26 Apr 2022 09:46:18 +0000 (11:46 +0200)
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>
drivers/net/phy/marvell10g.c

index b6fea119fe137e978aebd20cef4bd3870294a2bb..2b7d0720720b6b2aa38d28139e6db013909beb99 100644 (file)
@@ -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)) {