github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

platform/x86/amd/pmc: Avoid logging "(null)" for DMI values

Browse Source 
dmi_get_system_info(...) can return NULL. Using that as %s arguments
of dev_info() would log "(null)" (as part of a message like
'... System Vendor: "(null)", Product Name: "(null)" ...'), which may
be confusing for users.

Use Elvis operator to print "(Unknown)" instead.

Fixes: 428b9fd2dc ("platform/x86/amd/pmc: Add delay_suspend module parameter")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202606251540.Nr2BtaNu-lkp@intel.com/
Suggested-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Daniel Gibson <daniel@gibson.sh>
Link: https://patch.msgid.link/20260626220210.1761783-2-daniel@gibson.sh
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
Daniel Gibson 2026-06-27 00:02:10 +02:00 committed by Ilpo Järvinen
parent dc59e4fea9
commit a0738abd04
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/platform/x86/amd/pmc/pmc.c
View File

@ -735,11 +735,11 @@ static bool amd_pmc_want_suspend_delay(struct amd_pmc_dev *pdev)
} else if (delay_suspend == 1) {
if (!intermediate_wakeup)
dev_info(pdev->dev, "Delaying suspend by 2.5s because delay_suspend=1. If this solves problems on your machine, please report this whole line to: platform-driver-x86@vger.kernel.org so it can be automatically detected as affected in the future. System Vendor: \"%s\" Product Name: \"%s\" Product Family: \"%s\" Board Vendor: \"%s\" Board Name: \"%s\"\n",
dmi_get_system_info(DMI_SYS_VENDOR),
dmi_get_system_info(DMI_PRODUCT_NAME),
dmi_get_system_info(DMI_PRODUCT_FAMILY),
dmi_get_system_info(DMI_BOARD_VENDOR),
dmi_get_system_info(DMI_BOARD_NAME));
dmi_get_system_info(DMI_SYS_VENDOR) ?: "(Unknown)",
dmi_get_system_info(DMI_PRODUCT_NAME) ?: "(Unknown)",
dmi_get_system_info(DMI_PRODUCT_FAMILY) ?: "(Unknown)",
dmi_get_system_info(DMI_BOARD_VENDOR) ?: "(Unknown)",
dmi_get_system_info(DMI_BOARD_NAME) ?: "(Unknown)");
return true;
}
return false;