---

yaml --- r: 27210 b: refs/heads/master c: 8ab8fca h: refs/heads/master v: v3
git-mirror · Jun 13, 2006 · 8e77cd7 · 8e77cd7
1 parent 0477a22
commit 8e77cd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26ec43f132d1cf282124a020b2bb5310496c9132
+refs/heads/master: 8ab8fca2071cec559e4b77212cccffd150ce5ce7
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -3442,6 +3442,7 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
 		}
 	}
 
+	sky2_write32(hw, B0_IMSK, 0);
 	pci_save_state(pdev);
 	sky2_set_power_state(hw, pstate);
 	return 0;
@@ -3460,6 +3461,8 @@ static int sky2_resume(struct pci_dev *pdev)
 	if (err)
 		goto out;
 
+	sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
+
 	for (i = 0; i < hw->ports; i++) {
 		struct net_device *dev = hw->dev[i];
 		if (dev && netif_running(dev)) {