aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/dsa/mv88e6xxx
diff options
context:
space:
mode:
authorDan Carpenter2022-02-07 11:24:39 +0300
committerDavid S. Miller2022-02-07 12:35:10 +0000
commitff62433883b3ab753a78954ecf46e2c514f5c407 (patch)
treeef3071a378bf225e597a89fc7f8411a89fc27f14 /drivers/net/dsa/mv88e6xxx
parentdde41a697331fdcf1fd0eae85dc061d289626f1e (diff)
net: dsa: mv88e6xxx: Unlock on error in mv88e6xxx_port_bridge_join()
Call mv88e6xxx_reg_unlock(chip) before returning on this error path. Fixes: 7af4a361a62f ("net: dsa: mv88e6xxx: Improve isolation of standalone ports") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/mv88e6xxx')
-rw-r--r--drivers/net/dsa/mv88e6xxx/chip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 192a7688b4df..c54649c4c3a0 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2602,7 +2602,7 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port,
err = mv88e6xxx_port_set_map_da(chip, port, true);
if (err)
- return err;
+ goto unlock;
err = mv88e6xxx_port_commit_pvid(chip, port);
if (err)