diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-06 09:56:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-06 09:56:26 -0700 |
| commit | 164e64adc246dd4239ab644dff86241d17cef218 (patch) | |
| tree | 9f5c402a7f2b36f9e012d3c79cb993422a099494 /drivers/acpi/scan.c | |
| parent | 2423e142b37e2fcce61ea6d3c2f103384ae05f92 (diff) | |
| parent | 3da53c754502acf74d4d9ba8ac23fc356e6c3d0f (diff) | |
| download | linux-164e64adc246dd4239ab644dff86241d17cef218.tar.gz linux-164e64adc246dd4239ab644dff86241d17cef218.tar.bz2 linux-164e64adc246dd4239ab644dff86241d17cef218.zip | |
Merge tag 'acpi-5.13-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"These revert one recent commit that turned out to be problematic,
address two issues in the ACPI "custom method" interface and update
GPIO properties documentation.
Specifics:
- Revent recent commit related to the handling of ACPI power
resources during initialization, because it turned out to cause
problems to occur on some systems (Rafael Wysocki).
- Fix potential use-after-free and potential memory leak in the ACPI
"custom method" debugfs interface (Mark Langsdorf).
- Update ACPI GPIO properties documentation to cover assumptions
regarding GPIO polarity (Andy Shevchenko)"
* tag 'acpi-5.13-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "ACPI: scan: Turn off unused power resources during initialization"
ACPI: custom_method: fix a possible memory leak
ACPI: custom_method: fix potential use-after-free issue
Documentation: firmware-guide: gpio-properties: Add note to SPI CS case
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index bc973fbd70b2..a22778e880c2 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2359,8 +2359,6 @@ int __init acpi_scan_init(void) } } - acpi_turn_off_unused_power_resources(); - acpi_scan_initialized = true; out: |