projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f86a3b8
)
net: dsa: bcm_sf2: Propagate error value from mdio_write
author
Kangjie Lu
<kjlu@umn.edu>
Wed, 26 Dec 2018 04:08:18 +0000
(22:08 -0600)
committer
David 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
patch
|
blob
|
blame
|
history
diff --git
a/drivers/net/dsa/bcm_sf2.c
b/drivers/net/dsa/bcm_sf2.c
index aa4a1f5206f1fc48a44a51f8bef61f58492569a5..361fbde766540230348367b3766a829bdcd3dd12 100644
(file)
--- a/
drivers/net/dsa/bcm_sf2.c
+++ b/
drivers/net/dsa/bcm_sf2.c
@@
-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)