aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2024-04-18 08:34:25 +0300
committerIntel ChromeOS bot <linuxwifi@intel.com>2024-04-18 16:32:05 +0300
commit04f7ca6bbca3a33997494f2fab24201100aec405 (patch)
treeda50d287bea4aaaf999477b700b2dc9512bfed13
parentaf28bdeef6e3e712491ff4d0bd944e5d8dc9ca22 (diff)
downloadchromeos-04f7ca6bbca3a33997494f2fab24201100aec405.tar.gz
CHROMIUM: iwl7000: always print the firmware version in hex
All our firmware versions should now be printed in hex. Change-Id: I5043383bd0e81f872c55046afd2c6560f482c8e0 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> iwl7000-tree: b5d73e16b923898d8cfddeb794f8b8c660867e22
-rw-r--r--drivers/net/wireless/iwl7000/iwlwifi/iwl-drv.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwl7000/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwl7000/iwlwifi/iwl-drv.c
index 3551c54e29d557..b4aec25f81f024 100644
--- a/drivers/net/wireless/iwl7000/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwl7000/iwlwifi/iwl-drv.c
@@ -1260,16 +1260,10 @@ fw_dbg_conf:
minor = le32_to_cpup(ptr++);
local_comp = le32_to_cpup(ptr);
- if (major >= 35)
- snprintf(drv->fw.fw_version,
- sizeof(drv->fw.fw_version),
- "%u.%08x.%u %s", major, minor,
- local_comp, iwl_reduced_fw_name(drv));
- else
- snprintf(drv->fw.fw_version,
- sizeof(drv->fw.fw_version),
- "%u.%u.%u %s", major, minor,
- local_comp, iwl_reduced_fw_name(drv));
+ snprintf(drv->fw.fw_version,
+ sizeof(drv->fw.fw_version),
+ "%u.%08x.%u %s", major, minor,
+ local_comp, iwl_reduced_fw_name(drv));
break;
}
case IWL_UCODE_TLV_FW_DBG_DEST: {