diff options
author | Giridhar Malavali <giridhar.malavali@qlogic.com> | 2010-12-22 01:00:26 +0100 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-12-23 23:09:33 +0100 |
commit | 900a36e3277ac9109fe364a6a1420c71265f9377 (patch) | |
tree | c691bd049e1a9db8817608284bbcbe2f01f7ec09 /drivers/scsi | |
parent | [SCSI] qla2xxx: Remove code to not reset ISP82xx on failure. (diff) | |
download | linux-900a36e3277ac9109fe364a6a1420c71265f9377.tar.xz linux-900a36e3277ac9109fe364a6a1420c71265f9377.zip |
[SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_bsg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c index 10942fc9808d..903b0586ded3 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.c +++ b/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; } } |