diff options
| author | Vikas Chaudhary <vikas.chaudhary@qlogic.com> | 2012-08-22 07:45:26 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-24 12:11:04 +0400 |
| commit | da106212cbec2f4c96543d66fd24958b72b67ab1 (patch) | |
| tree | e7fa4a2d7e5a4c803777e38d57a43f67c41c6ae6 /drivers/scsi/qla4xxx | |
| parent | d9e62e513081c66d85bb0b91740ce3313c56b546 (diff) | |
| download | op-kernel-dev-da106212cbec2f4c96543d66fd24958b72b67ab1.zip op-kernel-dev-da106212cbec2f4c96543d66fd24958b72b67ab1.tar.gz | |
[SCSI] qla4xxx: Wait for cmd to complete before chip reset for ISP40XX
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla4xxx')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index f06b7c5..0a0c9c5 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -3000,10 +3000,10 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha) set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(HZ); } - +chip_reset: if (!test_bit(AF_FW_RECOVERY, &ha->flags)) qla4xxx_cmd_wait(ha); -chip_reset: + qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS); qla4xxx_abort_active_cmds(ha, DID_RESET << 16); DEBUG2(ql4_printk(KERN_INFO, ha, |
