diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-05-13 20:39:58 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-05-13 20:39:58 +0200 |
| commit | fd38651716b45f817a542c34cd5336ff372d06e6 (patch) | |
| tree | d725c3e4eece61e70c96e91a076b5c71d3eff787 /drivers/acpi/scan.c | |
| parent | ACPI: scan: Fix a memory leak in an error handling path (diff) | |
| parent | ACPI: PM: Add ACPI ID of Alder Lake Fan (diff) | |
| download | linux-dev-fd38651716b45f817a542c34cd5336ff372d06e6.tar.xz linux-dev-fd38651716b45f817a542c34cd5336ff372d06e6.zip | |
Merge branch 'acpi-pm'
* acpi-pm:
ACPI: PM: Add ACPI ID of Alder Lake Fan
Revert "Revert "ACPI: scan: Turn off unused power resources during initialization""
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 651a431e2bbf..453eff8ec8c3 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2360,6 +2360,8 @@ int __init acpi_scan_init(void) } } + acpi_turn_off_unused_power_resources(); + acpi_scan_initialized = true; out: |