[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <AANLkTimZvwdY8Q+=iGMC2MhPt_Vow38a0SE9g4ij-cRe@mail.gmail.com>
Date: Mon, 1 Nov 2010 21:35:49 +0000
From: Daniel J Blueman <daniel.blueman@...il.com>
To: "David S. Miller" <davem@...emloft.net>
Cc: Linux Kernel <linux-kernel@...r.kernel.org>
Subject: [2.6.37-rc1, patch] r8169: fix sleeping while holding spinlock...
Recent changes to the r8169 driver cause it to call
device_set_wakeup_enable under spinlock, which may sleep.
Locking isn't necessary around the call to device_set_wakeup_enable,
so drop the spinlock before calling it, to address this.
Signed-off-by: Daniel J Blueman <daniel.blueman@...il.com>
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index d88ce9f..894e7c7 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;
}
--
Daniel J Blueman
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists