From: Ben Hutchings <bhutchings@solarflare.com>
Date: Sat, 31 May 2008 15:52:52 +0000 (+0100)
Subject: sky2: Hold RTNL while calling dev_close()
X-Git-Tag: v2.6.26-rc6~13^2^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68c2889834602f6efed195f44439ef5d526683a8;p=linux-2.6

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>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 3bb60530d4..62436b3a18 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;
 			}
 		}