* [PATCH 2/2] r8169: fix sleeping while holding spinlock.
@ 2010-11-08 23:23 Francois Romieu
2010-11-08 23:48 ` Andrew Hendry
2010-11-09 16:27 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Francois Romieu @ 2010-11-08 23:23 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Daniel J Blueman, Rafael J. Wysocki
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>
---
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 3a0877e..4c4d169 100644
--- 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;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] r8169: fix sleeping while holding spinlock.
2010-11-08 23:23 [PATCH 2/2] r8169: fix sleeping while holding spinlock Francois Romieu
@ 2010-11-08 23:48 ` Andrew Hendry
2010-11-09 16:27 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Hendry @ 2010-11-08 23:48 UTC (permalink / raw)
To: Francois Romieu
Cc: netdev, David S. Miller, Daniel J Blueman, Rafael J. Wysocki
Was getting this error on boot "BUG: scheduling while atomic:
ethtool/1430/0x00000002" patch fixed them.
Acked-by: Andrew Hendry <andrew.hendry@gmail.com>
On Tue, Nov 9, 2010 at 10:23 AM, Francois Romieu <romieu@fr.zoreil.com> wrote:
> 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>
> ---
> 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 3a0877e..4c4d169 100644
> --- 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;
> }
>
> --
> 1.7.2.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] r8169: fix sleeping while holding spinlock.
2010-11-08 23:23 [PATCH 2/2] r8169: fix sleeping while holding spinlock Francois Romieu
2010-11-08 23:48 ` Andrew Hendry
@ 2010-11-09 16:27 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2010-11-09 16:27 UTC (permalink / raw)
To: romieu; +Cc: netdev, daniel.blueman, rjw
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Tue, 9 Nov 2010 00:23:58 +0100
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-11-09 16:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-08 23:23 [PATCH 2/2] r8169: fix sleeping while holding spinlock Francois Romieu
2010-11-08 23:48 ` Andrew Hendry
2010-11-09 16:27 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).