diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-12 18:07:46 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-12 18:07:46 +0300 |
commit | f2a7346955e56cacdc2f4ec6165537cc6fe5689a (patch) | |
tree | 18efb8077dfa79edaf08d75748bace9ee1c1c3df /drivers | |
parent | 58890f31f98db230e708905a7f0bd700756ebbed (diff) | |
parent | c5781ffbbd4f742a58263458145fe7f0ac01d9e0 (diff) | |
download | linux-f2a7346955e56cacdc2f4ec6165537cc6fe5689a.tar.xz |
Merge tag 'acpi-5.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"Fix an ACPICA issue introduced during the 4.20 development cycle and
causing some systems to crash because of leftover operation region
data still maintained after the operation region in question has gone
away (Erik Schmauss)"
* tag 'acpi-5.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPICA: Namespace: remove address node from global list after method termination
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/acpica/nsobject.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c index 8638f43cfc3d..79d86da1c892 100644 --- a/drivers/acpi/acpica/nsobject.c +++ b/drivers/acpi/acpica/nsobject.c @@ -186,6 +186,10 @@ void acpi_ns_detach_object(struct acpi_namespace_node *node) } } + if (obj_desc->common.type == ACPI_TYPE_REGION) { + acpi_ut_remove_address_range(obj_desc->region.space_id, node); + } + /* Clear the Node entry in all cases */ node->object = NULL; |