---

yaml --- r: 188011 b: refs/heads/master c: 2a40018 h: refs/heads/master i: 188009: 5aa5a11 188007: 4fcf620 v: v3
git-mirror · Mar 13, 2010 · de5fa2a · de5fa2a
1 parent 82153a6
commit de5fa2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2577a065832f2c6d108de2e027891bdb2d78924
+refs/heads/master: 2a40018984c5c9647df1c18489449a3a227d9136
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -4863,6 +4863,7 @@ static int sky2_resume(struct pci_dev *pdev)
 	if (!hw)
 		return 0;
 
+	rtnl_lock();
 	err = pci_set_power_state(pdev, PCI_D0);
 	if (err)
 		goto out;
@@ -4884,7 +4885,6 @@ static int sky2_resume(struct pci_dev *pdev)
 	sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
 	napi_enable(&hw->napi);
 
-	rtnl_lock();
 	for (i = 0; i < hw->ports; i++) {
 		err = sky2_reattach(hw->dev[i]);
 		if (err)