---

yaml --- r: 97954 b: refs/heads/master c: 68c2889 h: refs/heads/master v: v3
git-mirror · Jun 10, 2008 · e3aae8e · e3aae8e
1 parent bd4b3b9
commit e3aae8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69de8d23d10694bdd63fe715b98e1a61c56ed288
+refs/heads/master: 68c2889834602f6efed195f44439ef5d526683a8
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -4404,7 +4404,9 @@ static int sky2_resume(struct pci_dev *pdev)
 			if (err) {
 				printk(KERN_ERR PFX "%s: could not up: %d\n",
 				       dev->name, err);
+				rtnl_lock();
 				dev_close(dev);
+				rtnl_unlock();
 				goto out;
 			}
 		}