diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-05-25 09:13:52 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-05-25 09:13:52 -0300 |
| commit | 100475f83b9d2fbdb6f34a9b5fca9318e039b2d6 (patch) | |
| tree | 630d9e2403541d9005ecf4a9aca52ca0befab217 /drivers/acpi/scan.c | |
| parent | 19d71c2cbe060ca8b7da0a43ee549f8352211155 (diff) | |
| parent | a050a6d2b7e80ca52b2f4141eaf3420d201b72b3 (diff) | |
| download | lwn-100475f83b9d2fbdb6f34a9b5fca9318e039b2d6.tar.gz lwn-100475f83b9d2fbdb6f34a9b5fca9318e039b2d6.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes from perf/urgent.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
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: |