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>
This commit is contained in:
Родитель
9f71a568f5
Коммит
dbbcbb2d95
|
@ -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();
|
||||
|
|
Загрузка…
Ссылка в новой задаче