diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-06 10:49:01 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-05-06 10:49:01 +0200 |
| commit | 317e2cac4551879f14eb383fd4e5469f29231a0d (patch) | |
| tree | 3d12ea38a84b455b4e52598abb14fd6e176096c5 /drivers/acpi/acpica/nsalloc.c | |
| parent | 2c2a2fb1e2a9256714338875bede6b7cbd4b9542 (diff) | |
| parent | f456277ee15ff5d150191cb4a2f0181a8804c851 (diff) | |
| download | kernel_replicant_linux-317e2cac4551879f14eb383fd4e5469f29231a0d.tar.gz kernel_replicant_linux-317e2cac4551879f14eb383fd4e5469f29231a0d.tar.bz2 kernel_replicant_linux-317e2cac4551879f14eb383fd4e5469f29231a0d.zip | |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20190405
ACPICA: Namespace: add check to avoid null pointer dereference
ACPICA: Update version to 20190329
ACPICA: utilities: fix spelling of PCC to platform_comm_channel
ACPICA: Rename nameseg length macro/define for clarity
ACPICA: Rename nameseg compare macro for clarity
ACPICA: Rename nameseg copy macro for clarity
Diffstat (limited to 'drivers/acpi/acpica/nsalloc.c')
| -rw-r--r-- | drivers/acpi/acpica/nsalloc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c index 5470213b8e64..6eb63db72249 100644 --- a/drivers/acpi/acpica/nsalloc.c +++ b/drivers/acpi/acpica/nsalloc.c @@ -74,6 +74,10 @@ void acpi_ns_delete_node(struct acpi_namespace_node *node) ACPI_FUNCTION_NAME(ns_delete_node); + if (!node) { + return_VOID; + } + /* Detach an object if there is one */ acpi_ns_detach_object(node); |