diff options
| author | Guenter Roeck | 2015-04-16 07:12:42 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-04-16 18:12:55 +0200 |
| commit | 538cc282a3efb62cdb62ff9e6e44918c11a3c886 (patch) | |
| tree | 42aa6fa23f9560c9b387a793c49891ab10602be0 | |
| parent | fou: avoid missing unlock in failure path (diff) | |
| download | kernel-qcow2-linux-538cc282a3efb62cdb62ff9e6e44918c11a3c886.tar.gz kernel-qcow2-linux-538cc282a3efb62cdb62ff9e6e44918c11a3c886.tar.xz kernel-qcow2-linux-538cc282a3efb62cdb62ff9e6e44918c11a3c886.zip | |
dsa: mv88e6xxx: Fix error handling in mv88e6xxx_set_port_state
Return correct error code if _mv88e6xxx_reg_read returns an error.
Fixes: facd95b2e0ec0 ("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>
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index fc8d3b6ffe8e..f64186a5f634 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -908,8 +908,10 @@ static int mv88e6xxx_set_port_state(struct dsa_switch *ds, int port, u8 state) mutex_lock(&ps->smi_mutex); reg = _mv88e6xxx_reg_read(ds, REG_PORT(port), PORT_CONTROL); - if (reg < 0) + if (reg < 0) { + ret = reg; goto abort; + } oldstate = reg & PORT_CONTROL_STATE_MASK; if (oldstate != state) { |