From: Johannes Berg Date: Sun, 4 Feb 2024 09:53:18 +0000 (+0100) Subject: wifi: iwlwifi: fw: fix compiler warning for NULL string print X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4c60c8054dd8a36091aab585569c8d12a0085bd9;p=linux.git 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 "" in that case. While at it, fix some indentation in the function. Reported-by: kernel test robot 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 --- diff --git a/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c b/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c index a42775141952f..21b90278d1f22 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) ?: ""); + fwrt->ppag_flags = 0; + return false; } return true;