Skip to content

Commit d69d1f7

Browse files
committed
ACPI: PM: sleep: Do not set suspend_ops unnecessarily
If none of the S1 - S3 sleep states is supported, it is not necessary to register suspend_ops, so don't do that then. Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent a9a8f82 commit d69d1f7

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

drivers/acpi/sleep.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -815,14 +815,18 @@ void __weak acpi_s2idle_setup(void)
815815

816816
static void acpi_sleep_suspend_setup(void)
817817
{
818+
bool suspend_ops_needed = false;
818819
int i;
819820

820821
for (i = ACPI_STATE_S1; i < ACPI_STATE_S4; i++)
821-
if (acpi_sleep_state_supported(i))
822+
if (acpi_sleep_state_supported(i)) {
822823
sleep_states[i] = 1;
824+
suspend_ops_needed = true;
825+
}
823826

824-
suspend_set_ops(old_suspend_ordering ?
825-
&acpi_suspend_ops_old : &acpi_suspend_ops);
827+
if (suspend_ops_needed)
828+
suspend_set_ops(old_suspend_ordering ?
829+
&acpi_suspend_ops_old : &acpi_suspend_ops);
826830

827831
acpi_s2idle_setup();
828832
}

0 commit comments

Comments
 (0)