projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
53f5735
)
r8169: fix sleeping while holding spinlock.
author
françois romieu
<
[email protected]
>
Mon, 8 Nov 2010 13:23:58 +0000
(13:23 +0000)
committer
David S. Miller
<
[email protected]
>
Tue, 9 Nov 2010 16:26:43 +0000
(08:26 -0800)
As device_set_wakeup_enable can now sleep, move the call to outside
the critical section.
Signed-off-by: Daniel J Blueman <
[email protected]
>
Acked-by: Rafael J. Wysocki <
[email protected]
>
Acked-by: Andrew Hendry <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/r8169.c
patch
|
blob
|
history
diff --git
a/drivers/net/r8169.c
b/drivers/net/r8169.c
index 3a0877e0f97ca189bde28e40846baf3c4301c3a1..4c4d16905efb7253a055978e736edc93381cdd69 100644
(file)
--- a/
drivers/net/r8169.c
+++ b/
drivers/net/r8169.c
@@
-846,10
+846,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;
}