diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-19 16:41:08 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-19 16:41:08 +0300 |
| commit | 3394ade23d7e3934a166e973e664046ea6f559d4 (patch) | |
| tree | f3078f5f2829da66e1e29e9d83917814af2f2356 /drivers/acpi/thermal.c | |
| parent | b0d369dbad20a8c9702607e7294d63c4a0c8e0fe (diff) | |
| parent | a2b47f77e740a21dbdcb12e2f2ca3c840299545a (diff) | |
| download | linux-3394ade23d7e3934a166e973e664046ea6f559d4.tar.xz | |
Merge v6.15.3
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi/thermal.c')
| -rw-r--r-- | drivers/acpi/thermal.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 0c874186f8ae..5c2defe55898 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -803,6 +803,12 @@ static int acpi_thermal_add(struct acpi_device *device) acpi_thermal_aml_dependency_fix(tz); + /* + * Set the cooling mode [_SCP] to active cooling. This needs to happen before + * we retrieve the trip point values. + */ + acpi_execute_simple_method(tz->device->handle, "_SCP", ACPI_THERMAL_MODE_ACTIVE); + /* Get trip points [_ACi, _PSV, etc.] (required). */ acpi_thermal_get_trip_points(tz); @@ -814,10 +820,6 @@ static int acpi_thermal_add(struct acpi_device *device) if (result) goto free_memory; - /* Set the cooling mode [_SCP] to active cooling. */ - acpi_execute_simple_method(tz->device->handle, "_SCP", - ACPI_THERMAL_MODE_ACTIVE); - /* Determine the default polling frequency [_TZP]. */ if (tzp) tz->polling_frequency = tzp; |