Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86886583 authored by Kangjie Lu's avatar Kangjie Lu Committed by Greg Kroah-Hartman
Browse files

net: dsa: bcm_sf2: Propagate error value from mdio_write 



[ 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: default avatarKangjie Lu <kjlu@umn.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d29d4ccc

drivers/net/dsa/bcm_sf2.c

+3 −4
Original line number Diff line number Diff line
@@ -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)