---

yaml --- r: 103118 b: refs/heads/master c: 9a60a82 h: refs/heads/master v: v3
git-mirror · Jun 28, 2008 · c6b894f · c6b894f
1 parent 8748fb4
commit c6b894f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9879c4fca9d93ccfb48d642421f3f6211eceec4
+refs/heads/master: 9a60a82600822d34dcbc4df0866ec6ce643c0e79
diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c
@@ -5559,6 +5559,11 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
 	/* set mac address */
 	nv_copy_mac_to_hw(dev);
 
+	/* Workaround current PCI init glitch:  wakeup bits aren't
+	 * being set from PCI PM capability.
+	 */
+	device_init_wakeup(&pci_dev->dev, 1);
+
 	/* disable WOL */
 	writel(0, base + NvRegWakeUpFlags);
 	np->wolenabled = 0;