aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-05-31 16:52:52 +0100
committerJeff Garzik <jgarzik@redhat.com>2008-06-10 18:40:44 -0400
commit68c2889834602f6efed195f44439ef5d526683a8 (patch)
tree7ebd78d9c03ddc08c980548a1ab957d480d834c7 /drivers
parent69de8d23d10694bdd63fe715b98e1a61c56ed288 (diff)
sky2: Hold RTNL while calling dev_close()
dev_close() must be called holding the RTNL. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/sky2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 3bb60530d4d..62436b3a18c 100644
--- a/drivers/net/sky2.c
+++ b/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;
}
}