diff --git a/[refs] b/[refs] index a911a745df5c..3b7558ff4094 100644 --- 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 index 3bb60530d4d7..62436b3a18c6 100644 --- 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; } }