]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
platform/x86/amd/pmc: Avoid logging "(null)" for DMI values
authorDaniel Gibson <daniel@gibson.sh>
Fri, 26 Jun 2026 22:02:10 +0000 (00:02 +0200)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Fri, 3 Jul 2026 13:24:28 +0000 (16:24 +0300)
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: 428b9fd2dce5 ("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>
drivers/platform/x86/amd/pmc/pmc.c

index d50ea62fa2f3a79c18a553047a57dfd39505dae2..347c3f6c5ae7026686904859deb3e9d76edb17c1 100644 (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;