ACPI: PM: s2idle: Add missing checks to acpi_s2idle_begin_lps0()
Rafael J. Wysocki
maintainerPATCH 1/1 ACPI: PM: s2idle: Add missing checks to acpi_s2idle_begin_lps0()
From: Rafael J. Wysocki <[email protected]>
Commit 32ece31db4df ("ACPI: PM: s2idle: Only retrieve constraints when needed"), that attempted to avoid useless evaluation of LPS0 _DSM Function 1 in lps0_device_attach(), forgot to add checks for lps0_device_handle and sleep_no_lps0 to acpi_s2idle_begin_lps0() where they should be done before calling lpi_device_get_constraints() or lpi_device_get_constraints_amd().
Add the missing checks.
--- drivers/acpi/x86/s2idle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/acpi/x86/s2idle.c +2 -1
@@ -515,7 +515,8 @@ static struct acpi_scan_handler lps0_hanstatic int acpi_s2idle_begin_lps0 (void ) { -if (pm_debug_messages_on && !lpi_constraints_table) { +if (lps0_device_handle && !sleep_no_lps0 && pm_debug_messages_on && + !lpi_constraints_table) {if (acpi_s2idle_vendor_amd ())lpi_device_get_constraints_amd ();else
Quoted 9 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
32ece31db4df("ACPI: PM: s2idle: Only retrieve constraints when needed"), that attempted to avoid useless evaluation of LPS0_DSMFunction 1 inlps0_device_attach(), forgot to add checks forlps0_device_handleandsleep_no_lps0toacpi_s2idle_begin_lps0()where they should be done before callinglpi_device_get_constraints()orlpi_device_get_constraints_amd().
Quoted 4 lines
Add the missing checks.
Fixes 32ece31db4df ("ACPI: PM: s2idle: Only retrieve constraints when needed")Signed-off-by Rafael J. Wysocki <[email protected]>
Quoted 19 lines
--- drivers/acpi/x86/s2idle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/acpi/x86/s2idle.c +2
-1@@ -515,7 +515,8 @@ static struct acpi_scan_handler lps0_hanstatic int acpi_s2idle_begin_lps0 (void ) { -if (pm_debug_messages_on && !lpi_constraints_table) { +if (lps0_device_handle && !sleep_no_lps0 && pm_debug_messages_on && + !lpi_constraints_table) {if (acpi_s2idle_vendor_amd ())lpi_device_get_constraints_amd ();else