diff options
| author | Tejun Heo <tj@kernel.org> | 2021-05-24 19:43:56 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2021-05-24 19:43:56 +0200 |
| commit | c2a11971549b16a24cce81250d84b63d53499fd0 (patch) | |
| tree | 7bfa4b1c61ec5ad44834a3e38da3d4958517a00f /drivers/acpi/scan.c | |
| parent | cgroup: inline cgroup_task_freeze() (diff) | |
| parent | cgroup: fix spelling mistakes (diff) | |
| download | linux-c2a11971549b16a24cce81250d84b63d53499fd0.tar.xz linux-c2a11971549b16a24cce81250d84b63d53499fd0.zip | |
Merge branch 'for-5.13-fixes' into for-5.14
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index a22778e880c2..453eff8ec8c3 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -700,6 +700,7 @@ int acpi_device_add(struct acpi_device *device, result = acpi_device_set_name(device, acpi_device_bus_id); if (result) { + kfree_const(acpi_device_bus_id->bus_id); kfree(acpi_device_bus_id); goto err_unlock; } @@ -2359,6 +2360,8 @@ int __init acpi_scan_init(void) } } + acpi_turn_off_unused_power_resources(); + acpi_scan_initialized = true; out: |