diff options
| author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2010-05-04 15:01:21 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-16 18:21:30 -0400 |
| commit | 0b9dae6aeb0e5397b426e135509046b323740fd5 (patch) | |
| tree | 0858a3ba69c74a29c191ead302ace7ada26d0285 /drivers/scsi/qla2xxx/qla_attr.c | |
| parent | b1de6ab79456724d316d5dfa4bbb28f166cda99e (diff) | |
| download | kernel_samsung_smdk4412-0b9dae6aeb0e5397b426e135509046b323740fd5.tar.gz kernel_samsung_smdk4412-0b9dae6aeb0e5397b426e135509046b323740fd5.tar.bz2 kernel_samsung_smdk4412-0b9dae6aeb0e5397b426e135509046b323740fd5.zip | |
[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/qla2xxx/qla_attr.c')
| -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 c272af4a76e..d416c3599e3 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, 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", |