diff options
| author | Linus Torvalds <[email protected]> | 2021-05-13 19:22:01 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-05-13 19:22:01 +0000 |
| commit | 2df38a8e9b838c94e08f90f0487a90cea4f92c25 (patch) | |
| tree | 2f7ea08df45d8e0ef19b52752d1cdcb8e63e1d22 /drivers/acpi/device_pm.c | |
| parent | Merge branch 'resizex' (patches from Maciej) (diff) | |
| parent | Merge branch 'acpi-pm' (diff) | |
| download | kernel-2df38a8e9b838c94e08f90f0487a90cea4f92c25.tar.gz kernel-2df38a8e9b838c94e08f90f0487a90cea4f92c25.zip | |
Merge tag 'acpi-5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"These revert an unnecessary revert of an ACPI power management commit,
add a missing device ID to one of the lists and fix a possible memory
leak in an error path.
Specifics:
- Revert a revert of a recent ACPI power management change that does
not need to be reverted after all (Rafael Wysocki).
- Add missing fan device ID to the list of device IDs for which the
devices should not be put into the ACPI PM domain (Sumeet
Pawnikar).
- Fix possible memory leak in an error path in the ACPI device
enumeration code (Christophe JAILLET)"
* tag 'acpi-5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: PM: Add ACPI ID of Alder Lake Fan
ACPI: scan: Fix a memory leak in an error handling path
Revert "Revert "ACPI: scan: Turn off unused power resources during initialization""
Diffstat (limited to 'drivers/acpi/device_pm.c')
| -rw-r--r-- | drivers/acpi/device_pm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 16c0fe8a72a7..d260bc1f3e6e 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -1313,6 +1313,7 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on) {"PNP0C0B", }, /* Generic ACPI fan */ {"INT3404", }, /* Fan */ {"INTC1044", }, /* Fan for Tiger Lake generation */ + {"INTC1048", }, /* Fan for Alder Lake generation */ {} }; struct acpi_device *adev = ACPI_COMPANION(dev); |