aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/qla_os.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-05-28 07:55:48 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-17 13:05:03 -0400
commit94d0e7b805961c44e4dc486ffc21075084bb7175 (patch)
tree1609752ea7a9adb28583147f0bea33a9f10877d7 /drivers/scsi/qla2xxx/qla_os.c
parent8fa728a26886f56a9ee10a44fea0ddda301d21c3 (diff)
[SCSI] allow sleeping in ->eh_device_reset_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_os.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 1693998aa727..360974eb2b26 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -613,12 +613,8 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd)
613 qla_printk(KERN_INFO, ha, 613 qla_printk(KERN_INFO, ha,
614 "scsi(%ld:%d:%d): DEVICE RESET ISSUED.\n", ha->host_no, id, lun); 614 "scsi(%ld:%d:%d): DEVICE RESET ISSUED.\n", ha->host_no, id, lun);
615 615
616 spin_unlock_irq(ha->host->host_lock); 616 if (qla2x00_wait_for_hba_online(ha) != QLA_SUCCESS)
617
618 if (qla2x00_wait_for_hba_online(ha) != QLA_SUCCESS) {
619 spin_lock_irq(ha->host->host_lock);
620 goto eh_dev_reset_done; 617 goto eh_dev_reset_done;
621 }
622 618
623 if (qla2x00_wait_for_loop_ready(ha) == QLA_SUCCESS) { 619 if (qla2x00_wait_for_loop_ready(ha) == QLA_SUCCESS) {
624 if (qla2x00_device_reset(ha, fcport) == 0) 620 if (qla2x00_device_reset(ha, fcport) == 0)
@@ -669,8 +665,6 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd)
669 "scsi(%ld:%d:%d): DEVICE RESET SUCCEEDED.\n", ha->host_no, id, lun); 665 "scsi(%ld:%d:%d): DEVICE RESET SUCCEEDED.\n", ha->host_no, id, lun);
670 666
671eh_dev_reset_done: 667eh_dev_reset_done:
672 spin_lock_irq(ha->host->host_lock);
673
674 return ret; 668 return ret;
675} 669}
676 670