From d9ed187350c4bc4a0cc4c12173e30baaa01970d7 Mon Sep 17 00:00:00 2001
From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Tue, 21 Dec 2010 16:00:26 -0800
Subject: [PATCH] --- yaml --- r: 226879 b: refs/heads/master c:
 900a36e3277ac9109fe364a6a1420c71265f9377 h: refs/heads/master i:   226877:
 17308983b6b5ec679f5e11fbbce0abafd976cee7   226875:
 f40309786bc7e7acb388e0f92d56f003ad9652f8   226871:
 f6b9c121c24bdc134ed4ef0f0e264d4b4cdb2049   226863:
 3e9f4f0c1ec4be2d76113f911813d9433731dbff   226847:
 43016eeae3eca92ea68d129168841cc0ba0384ae   226815:
 33187837973f28183a39e0a4b9b85cd8f6825447 v: v3

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

diff --git a/[refs] b/[refs]
index 9a25c0099f55..cccb52024741 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ce87911491d4167198b863c102c7e4d09202561
+refs/heads/master: 900a36e3277ac9109fe364a6a1420c71265f9377
diff --git a/trunk/drivers/scsi/qla2xxx/qla_bsg.c b/trunk/drivers/scsi/qla2xxx/qla_bsg.c
index 10942fc9808d..903b0586ded3 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_bsg.c
@@ -1512,6 +1512,7 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
 				if (((sp_bsg->type == SRB_CT_CMD) ||
 					(sp_bsg->type == SRB_ELS_CMD_HST))
 					&& (sp_bsg->u.bsg_job == bsg_job)) {
+					spin_unlock_irqrestore(&ha->hardware_lock, flags);
 					if (ha->isp_ops->abort_command(sp)) {
 						DEBUG2(qla_printk(KERN_INFO, ha,
 						    "scsi(%ld): mbx "
@@ -1527,6 +1528,7 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
 						bsg_job->req->errors =
 						bsg_job->reply->result = 0;
 					}
+					spin_lock_irqsave(&ha->hardware_lock, flags);
 					goto done;
 				}
 			}