redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

dsa: mv88e6xxx: Fix error handling in mv88e6xxx_set_port_state

Browse source 
Return correct error code if _mv88e6xxx_reg_read returns an error.

Fixes: facd95b2e0 ("net: dsa: mv88e6xxx: Add Hardware bridging support")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Guenter Roeck 2015-04-15 22:12:42 -07:00 committed by David S. Miller
parent 540207ae69
commit 538cc282a3
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/dsa/mv88e6xxx.c
View file

@ -908,8 +908,10 @@ static int mv88e6xxx_set_port_state(struct dsa_switch *ds, int port, u8 state)
mutex_lock(&ps->smi_mutex); mutex_lock(&ps->smi_mutex);
reg = _mv88e6xxx_reg_read(ds, REG_PORT(port), PORT_CONTROL); reg = _mv88e6xxx_reg_read(ds, REG_PORT(port), PORT_CONTROL);
if (reg < 0) if (reg < 0) {
ret = reg;
goto abort; goto abort;
}
oldstate = reg & PORT_CONTROL_STATE_MASK; oldstate = reg & PORT_CONTROL_STATE_MASK;
if (oldstate != state) { if (oldstate != state) {