diff options
| author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2010-05-04 18:01:21 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-16 18:21:30 -0400 |
| commit | 0b9dae6aeb0e5397b426e135509046b323740fd5 (patch) | |
| tree | 0858a3ba69c74a29c191ead302ace7ada26d0285 /drivers/scsi | |
| parent | b1de6ab79456724d316d5dfa4bbb28f166cda99e (diff) | |
[SCSI] qla2xxx: Check for ISP84xx before processing to get 84xx firmware version.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_attr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index c272af4a76e4..d416c3599e38 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c | |||
| @@ -1198,9 +1198,11 @@ qla24xx_84xx_fw_version_show(struct device *dev, | |||
| 1198 | scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); | 1198 | scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); |
| 1199 | struct qla_hw_data *ha = vha->hw; | 1199 | struct qla_hw_data *ha = vha->hw; |
| 1200 | 1200 | ||
| 1201 | if (IS_QLA84XX(ha) && ha->cs84xx) | 1201 | if (!IS_QLA84XX(ha)) |
| 1202 | if (ha->cs84xx->op_fw_version == 0) | 1202 | return snprintf(buf, PAGE_SIZE, "\n"); |
| 1203 | rval = qla84xx_verify_chip(vha, status); | 1203 | |
| 1204 | if (ha->cs84xx && ha->cs84xx->op_fw_version == 0) | ||
| 1205 | rval = qla84xx_verify_chip(vha, status); | ||
| 1204 | 1206 | ||
| 1205 | if ((rval == QLA_SUCCESS) && (status[0] == 0)) | 1207 | if ((rval == QLA_SUCCESS) && (status[0] == 0)) |
| 1206 | return snprintf(buf, PAGE_SIZE, "%u\n", | 1208 | return snprintf(buf, PAGE_SIZE, "%u\n", |