From dfe5eb38fe848bdbe6c00e6d2075322d76e9d683 Mon Sep 17 00:00:00 2001
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Tue, 9 Jun 2009 06:35:12 +0000
Subject: [PATCH] --- yaml --- r: 150791 b: refs/heads/master c:
 1abb0de2f89c1f9c454c973356b9e4867722f10a h: refs/heads/master i:   150789:
 b188adf7d66e6b3e21a5c3e0368e5f7feb148e4c   150787:
 08823d0034b3b84323edb15bd0848643cab4c17d   150783:
 3130ca73baf254a2e7c5b680b9f1c3f56b38cdbe v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/qlge/qlge_main.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 29ee44d8602f..45ffbe75bbbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00acd0d2ecac925fdcbe47cbda5ea517f87ad354
+refs/heads/master: 1abb0de2f89c1f9c454c973356b9e4867722f10a
diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c
index 5055f5b37a73..024c7343ada0 100644
--- a/trunk/drivers/net/qlge/qlge_main.c
+++ b/trunk/drivers/net/qlge/qlge_main.c
@@ -3299,7 +3299,6 @@ static int ql_adapter_up(struct ql_adapter *qdev)
 	err = ql_adapter_initialize(qdev);
 	if (err) {
 		QPRINTK(qdev, IFUP, INFO, "Unable to initialize adapter.\n");
-		spin_unlock(&qdev->hw_lock);
 		goto err_init;
 	}
 	set_bit(QL_ADAPTER_UP, &qdev->flags);