[ros-diffs] [reactos] 01/01: [ACPICA] Update to version 20190405. CORE-15926

[Thomas Faber]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89a587169b65773f18c5c0d5cd2ec27b7f8b1ffe

commit 89a587169b65773f18c5c0d5cd2ec27b7f8b1ffe
Author:     Thomas Faber <thomas.fa...@reactos.org>
AuthorDate: Sat Apr 6 15:21:35 2019 +0200
Commit:     Thomas Faber <thomas.fa...@reactos.org>
CommitDate: Sun Apr 7 10:59:52 2019 +0200

    [ACPICA] Update to version 20190405. CORE-15926
---
 drivers/bus/acpi/acpica/events/evgpe.c      | 8 ++++++++
 drivers/bus/acpi/acpica/include/acpixf.h    | 2 +-
 drivers/bus/acpi/acpica/namespace/nsalloc.c | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/acpi/acpica/events/evgpe.c 
b/drivers/bus/acpi/acpica/events/evgpe.c
index 7527a0031b..b293aee346 100644
--- a/drivers/bus/acpi/acpica/events/evgpe.c
+++ b/drivers/bus/acpi/acpica/events/evgpe.c
@@ -132,6 +132,14 @@ AcpiEvEnableGpe (
     ACPI_FUNCTION_TRACE (EvEnableGpe);
 
 
+    /* Clear the GPE (of stale events) */
+
+    Status = AcpiHwClearGpe(GpeEventInfo);
+    if (ACPI_FAILURE(Status))
+    {
+        return_ACPI_STATUS(Status);
+    }
+
     /* Enable the requested GPE */
 
     Status = AcpiHwLowSetGpe (GpeEventInfo, ACPI_GPE_ENABLE);
diff --git a/drivers/bus/acpi/acpica/include/acpixf.h 
b/drivers/bus/acpi/acpica/include/acpixf.h
index d700786dc3..75533de5e9 100644
--- a/drivers/bus/acpi/acpica/include/acpixf.h
+++ b/drivers/bus/acpi/acpica/include/acpixf.h
@@ -46,7 +46,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20190329
+#define ACPI_CA_VERSION                 0x20190405
 
 #include "acconfig.h"
 #include "actypes.h"
diff --git a/drivers/bus/acpi/acpica/namespace/nsalloc.c 
b/drivers/bus/acpi/acpica/namespace/nsalloc.c
index 8f079c3e9f..fb5cc71d00 100644
--- a/drivers/bus/acpi/acpica/namespace/nsalloc.c
+++ b/drivers/bus/acpi/acpica/namespace/nsalloc.c
@@ -124,6 +124,11 @@ AcpiNsDeleteNode (
     ACPI_FUNCTION_NAME (NsDeleteNode);
 
 
+    if (!Node)
+    {
+        return_VOID;
+    }
+
     /* Detach an object if there is one */
 
     AcpiNsDetachObject (Node);