diff --git a/[refs] b/[refs] index 9f09b90380fb..4b35a4f36794 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84e29308ede3edb4f03911246c33d697ff18722e +refs/heads/master: f0883ac6a74b403f0f2e91166ba06227cc4690e6 diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c index cf104abfd047..d726f48728ec 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_os.c +++ b/trunk/drivers/scsi/qla2xxx/qla_os.c @@ -317,6 +317,10 @@ qla2x00_fw_version_str(struct scsi_qla_host *ha, char *str) char * qla24xx_fw_version_str(struct scsi_qla_host *ha, char *str) { + sprintf(str, "%d.%02d.%02d ", ha->fw_major_version, + ha->fw_minor_version, + ha->fw_subminor_version); + if (ha->fw_attributes & BIT_0) strcat(str, "[Class 2] "); if (ha->fw_attributes & BIT_1) @@ -326,7 +330,6 @@ qla24xx_fw_version_str(struct scsi_qla_host *ha, char *str) if (ha->fw_attributes & BIT_13) strcat(str, "[Experimental]"); return str; - } static inline srb_t *