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

Commit b469a7cb authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Don't try to 'stop' firmware if already in ROM code. 



Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent a13d8ac0

drivers/scsi/qla2xxx/qla_init.c

+1 −1
Original line number Diff line number Diff line
@@ -4153,7 +4153,7 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *vha) 


	ret = qla2x00_stop_firmware(vha);

	for (retries = 5; ret != QLA_SUCCESS && ret != QLA_FUNCTION_TIMEOUT &&

	    retries ; retries--) {

	    ret != QLA_INVALID_COMMAND && retries ; retries--) {

		ha->isp_ops->reset_chip(vha);

		if (ha->isp_ops->chip_diag(vha) != QLA_SUCCESS)

			continue;

drivers/scsi/qla2xxx/qla_mbx.c

+2 −0
Original line number Diff line number Diff line
@@ -2477,6 +2477,8 @@ qla2x00_stop_firmware(scsi_qla_host_t *vha) 
	if (rval != QLA_SUCCESS) {

		DEBUG2_3_11(printk("%s(%ld): failed=%x.\n", __func__,

		    vha->host_no, rval));

		if (mcp->mb[0] == MBS_INVALID_COMMAND)

			rval = QLA_INVALID_COMMAND;

	} else {

		DEBUG11(printk("%s(%ld): done.\n", __func__, vha->host_no));

	}