From 685fa7c774eaaeb2e94d5c88313d8f1d81c92f6a Mon Sep 17 00:00:00 2001
From: Bhanu Gollapudi <bprakash@broadcom.com>
Date: Thu, 17 Mar 2011 17:13:26 -0700
Subject: [PATCH] --- yaml --- r: 242700 b: refs/heads/master c:
 839900c69d5b8a07a4df8e9bd9d1e59a5c556811 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/scsi/bnx2fc/bnx2fc_tgt.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9e4ca5442fd6..50b3ee7081ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70c7c88a1a65ca683eb7f3fe3ce79c72f29d845e
+refs/heads/master: 839900c69d5b8a07a4df8e9bd9d1e59a5c556811
diff --git a/trunk/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/trunk/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index 7ea93af60260..7cc05e4e82d5 100644
--- a/trunk/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/trunk/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -304,10 +304,8 @@ static void bnx2fc_upload_session(struct fcoe_port *port,
 				" not sent to FW\n");
 
 	/* Free session resources */
-	spin_lock_bh(&tgt->cq_lock);
 	bnx2fc_free_session_resc(hba, tgt);
 	bnx2fc_free_conn_id(hba, tgt->fcoe_conn_id);
-	spin_unlock_bh(&tgt->cq_lock);
 }
 
 static int bnx2fc_init_tgt(struct bnx2fc_rport *tgt,
@@ -830,11 +828,13 @@ static void bnx2fc_free_session_resc(struct bnx2fc_hba *hba,
 		tgt->rq = NULL;
 	}
 	/* Free CQ */
+	spin_lock_bh(&tgt->cq_lock);
 	if (tgt->cq) {
 		dma_free_coherent(&hba->pcidev->dev, tgt->cq_mem_size,
 				    tgt->cq, tgt->cq_dma);
 		tgt->cq = NULL;
 	}
+	spin_unlock_bh(&tgt->cq_lock);
 	/* Free SQ */
 	if (tgt->sq) {
 		dma_free_coherent(&hba->pcidev->dev, tgt->sq_mem_size,