tg3: Do not call device_set_wakeup_enable() under spin_lock_bh
Subsystems (2)
PATCH 1/1 tg3: Do not call device_set_wakeup_enable() under spin_lock_bh
From: Rafael J. Wysocki <[email protected]>
The tg3 driver calls device_set_wakeup_enable() under spin_lock_bh, which causes a problem to happen after the recent core power management changes, because this function can sleep now. Fix this by moving the device_set_wakeup_enable() call out of the spin_lock_bh-protected area.
---
Hi,
This fixes a regression from 2.6.36, please apply.
Thanks,
Rafael
--- drivers/net/tg3.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/tg3.c +5 -5
@@ -9732,16 +9732,16 @@ static int tg3_set_wol(struct net_device !((tp->tg3_flags & TG3_FLAG_WOL_CAP) && device_can_wakeup(dp))) return -EINVAL; +device_set_wakeup_enable (dp, wol->wolopts &WAKE_MAGIC ); +spin_lock_bh (&tp->lock); -if (wol->wolopts &WAKE_MAGIC ) { +if (device_may_wakeup (dp)) tp->tg3_flags |=TG3_FLAG_WOL_ENABLE ; -device_set_wakeup_enable (dp, true); - }else { +else tp->tg3_flags &= ~TG3_FLAG_WOL_ENABLE ; -device_set_wakeup_enable (dp, false); - }spin_unlock_bh (&tp->lock); +return 0 ; }
From: "Rafael J. Wysocki" <[email protected]>
Date: Tue, 26 Oct 2010 01:01:55 +0200
Quoted 10 lines
From: Rafael J. Wysocki <[email protected]>
The tg3 driver calls
device_set_wakeup_enable()underspin_lock_bh, which causes a problem to happen after the recent core power management changes, because this function can sleep now. Fix this by moving thedevice_set_wakeup_enable()call out of the spin_lock_bh-protected area.Reported-by Maxim Levitsky <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
Applied, thanks a lot.