Commit afb3cc1a authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: unlock the rtnl_mutex when dsa_master_setup() fails 



After the blamed commit, dsa_tree_setup_master() may exit without
calling rtnl_unlock(), fix that.

Fixes: c146f9bc ("net: dsa: hold rtnl_mutex when calling dsa_master_{setup,teardown}")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6a502c2

net/dsa/dsa2.c

+3 −3
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ static int dsa_tree_setup_switches(struct dsa_switch_tree *dst) 
static int dsa_tree_setup_master(struct dsa_switch_tree *dst)

{

	struct dsa_port *dp;

	int err;

	int err = 0;



	rtnl_lock();
@@ -1066,13 +1066,13 @@ static int dsa_tree_setup_master(struct dsa_switch_tree *dst) 
		if (dsa_port_is_cpu(dp)) {

			err = dsa_master_setup(dp->master, dp);

			if (err)

				return err;

				break;

		}

	}



	rtnl_unlock();



	return 0;

	return err;

}



static void dsa_tree_teardown_master(struct dsa_switch_tree *dst)