Commit dbbcbb2d authored Mar 28, 2008 by Daniel Walker Committed by Jeff Garzik Mar 28, 2008

netdev: ehea: locking order correction

Nested locks always need to be taken in the same order.  This change factors
out the ehea_fw_handles.lock to make the locking order consistent.

Signed-off-by: Daniel Walker <dwalker@mvista.com>
Cc: Christoph Raisch <raisch@de.ibm.com>
Cc: Jan-Bernd Themann <themann@de.ibm.com>
Cc: Thomas Klein <tklein@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 9f71a568

drivers/net/ehea/ehea_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2567,14 +2567,14 @@ static int ehea_down(struct net_device *dev)
		if (port->state == EHEA_PORT_DOWN)
		return 0;

		mutex_lock(&ehea_fw_handles.lock);

		down(&ehea_bcmc_regs.lock);
		ehea_drop_multicast_list(dev);
		ehea_broadcast_reg_helper(port, H_DEREG_BCMC);

		ehea_free_interrupts(dev);

		mutex_lock(&ehea_fw_handles.lock);

		port->state = EHEA_PORT_DOWN;

		ehea_update_bcmc_registrations();