OSDN Git Service

net: dsa: bcm_sf2: Propagate error value from mdio_write
authorKangjie Lu <kjlu@umn.edu>
Wed, 26 Dec 2018 04:08:18 +0000 (22:08 -0600)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Dec 2018 00:22:13 +0000 (16:22 -0800)
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>
drivers/net/dsa/bcm_sf2.c

index aa4a1f5..361fbde 100644 (file)
@@ -303,11 +303,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)