[SCSI] qla2xxx: Issue proper ISP callbacks during stop-firmware.

As the original code would incorrectly call the non-ISP24xx/25xx
callbacks during recovery, a stop-firmware failure could result
in improper bit-banging of the RISC and in some cases manifest in
a NMI-watchdog trigger due to the RISC not coming out of its
reset state.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

authored by

Andrew Vasquez and committed by
James Bottomley
8201e207 3d164fb0

+2 -2
+2 -2
drivers/scsi/qla2xxx/qla_init.c
··· 4038 4038 ret = qla2x00_stop_firmware(ha); 4039 4039 for (retries = 5; ret != QLA_SUCCESS && ret != QLA_FUNCTION_TIMEOUT && 4040 4040 retries ; retries--) { 4041 - qla2x00_reset_chip(ha); 4042 - if (qla2x00_chip_diag(ha) != QLA_SUCCESS) 4041 + ha->isp_ops->reset_chip(ha); 4042 + if (ha->isp_ops->chip_diag(ha) != QLA_SUCCESS) 4043 4043 continue; 4044 4044 if (qla2x00_setup_chip(ha) != QLA_SUCCESS) 4045 4045 continue;