Skip to content

Commit

Permalink
[SCSI] qla2xxx: Check for ISP84xx before processing to get 84xx firmw…
Browse files Browse the repository at this point in the history
…are version.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
  • Loading branch information
Andrew Vasquez authored and James Bottomley committed May 16, 2010
1 parent b1de6ab commit 0b9dae6
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/scsi/qla2xxx/qla_attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1198,9 +1198,11 @@ qla24xx_84xx_fw_version_show(struct device *dev,
scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
struct qla_hw_data *ha = vha->hw;

if (IS_QLA84XX(ha) && ha->cs84xx)
if (ha->cs84xx->op_fw_version == 0)
rval = qla84xx_verify_chip(vha, status);
if (!IS_QLA84XX(ha))
return snprintf(buf, PAGE_SIZE, "\n");

if (ha->cs84xx && ha->cs84xx->op_fw_version == 0)
rval = qla84xx_verify_chip(vha, status);

if ((rval == QLA_SUCCESS) && (status[0] == 0))
return snprintf(buf, PAGE_SIZE, "%u\n",
Expand Down

0 comments on commit 0b9dae6

Please sign in to comment.