From 605354b3a7fb319a714158f39fdafcb280835589 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Tue, 6 May 2008 19:36:26 +0100
Subject: [PATCH] --- yaml --- r: 98544 b: refs/heads/master c:
 c81ec80bc86f4eacd5f48229c1de623865acbb92 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/qla3xxx.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3866b750f2e7..a31b83f67193 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64c42f697661e27c9688a32c1ba61d0228e81d84
+refs/heads/master: c81ec80bc86f4eacd5f48229c1de623865acbb92
diff --git a/trunk/drivers/net/qla3xxx.c b/trunk/drivers/net/qla3xxx.c
index b7f7b2227d56..bccee68bd48a 100644
--- a/trunk/drivers/net/qla3xxx.c
+++ b/trunk/drivers/net/qla3xxx.c
@@ -3701,7 +3701,9 @@ static int ql_cycle_adapter(struct ql3_adapter *qdev, int reset)
 		printk(KERN_ERR PFX
 				"%s: Driver up/down cycle failed, "
 				"closing device\n",qdev->ndev->name);
+		rtnl_lock();
 		dev_close(qdev->ndev);
+		rtnl_unlock();
 		return -1;
 	}
 	return 0;