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

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

[SCSI] qla2xxx: Check for ISP84xx before processing to get 84xx firmware version. 



Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent b1de6ab7

drivers/scsi/qla2xxx/qla_attr.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -1198,8 +1198,10 @@ qla24xx_84xx_fw_version_show(struct device *dev, 
	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

	struct qla_hw_data *ha = vha->hw;

	struct qla_hw_data *ha = vha->hw;





	if (IS_QLA84XX(ha) && ha->cs84xx)

	if (!IS_QLA84XX(ha))

		if (ha->cs84xx->op_fw_version == 0)

		return snprintf(buf, PAGE_SIZE, "\n");



	if (ha->cs84xx && ha->cs84xx->op_fw_version == 0)

		rval = qla84xx_verify_chip(vha, status);

		rval = qla84xx_verify_chip(vha, status);





	if ((rval == QLA_SUCCESS) && (status[0] == 0))

	if ((rval == QLA_SUCCESS) && (status[0] == 0))