lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 191/321] net: dsa: bcm_sf2: Propagate error value from mdio_write
    Date
    From: Kangjie Lu <kjlu@umn.edu>

    [ Upstream commit e49505f7255be8ced695919c08a29bf2c3d79616 ]

    Both bcm_sf2_sw_indir_rw and mdiobus_write_nested could fail, so let's
    return their error codes upstream.

    Signed-off-by: Kangjie Lu <kjlu@umn.edu>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/dsa/bcm_sf2.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
    index 17cec68e56b4f..02a4187d81bd0 100644
    --- a/drivers/net/dsa/bcm_sf2.c
    +++ b/drivers/net/dsa/bcm_sf2.c
    @@ -309,11 +309,10 @@ static int bcm_sf2_sw_mdio_write(struct mii_bus *bus, int addr, int regnum,
    * send them to our master MDIO bus controller
    */
    if (addr == BRCM_PSEUDO_PHY_ADDR && priv->indir_phy_mask & BIT(addr))
    - bcm_sf2_sw_indir_rw(priv, 0, addr, regnum, val);
    + return bcm_sf2_sw_indir_rw(priv, 0, addr, regnum, val);
    else
    - mdiobus_write_nested(priv->master_mii_bus, addr, regnum, val);
    -
    - return 0;
    + return mdiobus_write_nested(priv->master_mii_bus, addr,
    + regnum, val);
    }

    static irqreturn_t bcm_sf2_switch_0_isr(int irq, void *dev_id)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-04 00:03    [W:4.101 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site