Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da106212 authored Aug 22, 2012 by Vikas Chaudhary Committed by James Bottomley Sep 24, 2012

[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>

parent d9e62e51

drivers/scsi/qla4xxx/ql4_os.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3000,10 +3000,10 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha)
	set_current_state(TASK_UNINTERRUPTIBLE);		set_current_state(TASK_UNINTERRUPTIBLE);
	schedule_timeout(HZ);		schedule_timeout(HZ);
	}		}
			chip_reset:
	if (!test_bit(AF_FW_RECOVERY, &ha->flags))		if (!test_bit(AF_FW_RECOVERY, &ha->flags))
	qla4xxx_cmd_wait(ha);		qla4xxx_cmd_wait(ha);
	chip_reset:
	qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);		qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
	qla4xxx_abort_active_cmds(ha, DID_RESET << 16);		qla4xxx_abort_active_cmds(ha, DID_RESET << 16);
	DEBUG2(ql4_printk(KERN_INFO, ha,		DEBUG2(ql4_printk(KERN_INFO, ha,