wifi: iwlwifi: fw: fix compiler warning for NULL string print
authorJohannes Berg <johannes.berg@intel.com>
Sun, 4 Feb 2024 09:53:18 +0000 (10:53 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Sun, 4 Feb 2024 09:53:18 +0000 (10:53 +0100)
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>
drivers/net/wireless/intel/iwlwifi/fw/regulatory.c

index a42775141952fd0d387ae9f0a8047c6fc6328117..21b90278d1f222ba59dbef976445290a51298803 100644 (file)
@@ -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;