diff options
| author | françois romieu <romieu@fr.zoreil.com> | 2010-11-08 13:23:58 +0000 |
|---|---|---|
| committer | AK <andi@firstfloor.org> | 2011-02-06 11:03:35 -0800 |
| commit | b628317b1d1a58bc5722c982fce2729120438734 (patch) | |
| tree | 0e2a1e4d437c5b6f10626d08d3b6ff86b88fe165 /drivers | |
| parent | 4fef93a724a0294bc372e3f0049b5f9dfa09e44e (diff) | |
| download | linux-stable-b628317b1d1a58bc5722c982fce2729120438734.tar.gz linux-stable-b628317b1d1a58bc5722c982fce2729120438734.tar.bz2 linux-stable-b628317b1d1a58bc5722c982fce2729120438734.zip | |
r8169: fix sleeping while holding spinlock.
[ Upstream commit ea80907ff066edd1dd43c5fe90ae6677d15e6384 ]
As device_set_wakeup_enable can now sleep, move the call to outside
the critical section.
Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/r8169.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index b99dd04710f2..857ecafefd2c 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -855,10 +855,10 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) else tp->features &= ~RTL_FEATURE_WOL; __rtl8169_set_wol(tp, wol->wolopts); - device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts); - spin_unlock_irq(&tp->lock); + device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts); + return 0; } |