diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-02-04 10:53:18 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2024-02-04 10:53:18 +0100 |
| commit | 4c60c8054dd8a36091aab585569c8d12a0085bd9 (patch) | |
| tree | dcc83d25ddc887a6062de6397e751b50da311334 /drivers/net/wireless/intel | |
| parent | 5f9c1f8f9adaf32e4e39fcf260d4fc20dbfb77c9 (diff) | |
| download | linux-stable-4c60c8054dd8a36091aab585569c8d12a0085bd9.tar.gz linux-stable-4c60c8054dd8a36091aab585569c8d12a0085bd9.tar.bz2 linux-stable-4c60c8054dd8a36091aab585569c8d12a0085bd9.zip | |
wifi: iwlwifi: fw: fix compiler warning for NULL string print
When the system is compiled without CONFIG_DMI, the function
here statically returns NULL, leading to a compiler warning.
Catch that and print "<unknown>" in that case.
While at it, fix some indentation in the function.
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202402030641.zUTuACYV-lkp@intel.com/
Fixes: 09059c6764a8 ("wifi: iwlwifi: prepare for reading PPAG table from UEFI")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c b/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c index a42775141952..21b90278d1f2 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c @@ -397,9 +397,9 @@ bool iwl_is_ppag_approved(struct iwl_fw_runtime *fwrt) if (!dmi_check_system(dmi_ppag_approved_list)) { IWL_DEBUG_RADIO(fwrt, "System vendor '%s' is not in the approved list, disabling PPAG.\n", - dmi_get_system_info(DMI_SYS_VENDOR)); - fwrt->ppag_flags = 0; - return false; + dmi_get_system_info(DMI_SYS_VENDOR) ?: "<unknown>"); + fwrt->ppag_flags = 0; + return false; } return true; |