From b1dc29fa09052190e87f93cf1888edea9c42df24 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 17 Jul 2020 22:53:36 +0000
Subject: Import ACPICA 20200717.

---
 source/components/utilities/utdelete.c | 6 +-----
 source/components/utilities/utids.c    | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'source/components/utilities')

diff --git a/source/components/utilities/utdelete.c b/source/components/utilities/utdelete.c
index 502ff4132116..aafd52959379 100644
--- a/source/components/utilities/utdelete.c
+++ b/source/components/utilities/utdelete.c
@@ -749,11 +749,6 @@ AcpiUtUpdateObjectReference (
             NextObject = Object->BufferField.BufferObj;
             break;
 
-        case ACPI_TYPE_LOCAL_REGION_FIELD:
-
-            NextObject = Object->Field.RegionObj;
-            break;
-
         case ACPI_TYPE_LOCAL_BANK_FIELD:
 
             NextObject = Object->BankField.BankObj;
@@ -789,6 +784,7 @@ AcpiUtUpdateObjectReference (
             }
             break;
 
+        case ACPI_TYPE_LOCAL_REGION_FIELD:
         case ACPI_TYPE_REGION:
         default:
 
diff --git a/source/components/utilities/utids.c b/source/components/utilities/utids.c
index e296c00a0bea..34ae697ab3c2 100644
--- a/source/components/utilities/utids.c
+++ b/source/components/utilities/utids.c
@@ -435,7 +435,7 @@ AcpiUtExecute_CID (
      * 3) Size of the actual CID strings
      */
     CidListSize = sizeof (ACPI_PNP_DEVICE_ID_LIST) +
-        ((Count - 1) * sizeof (ACPI_PNP_DEVICE_ID)) +
+        (Count * sizeof (ACPI_PNP_DEVICE_ID)) +
         StringAreaSize;
 
     CidList = ACPI_ALLOCATE_ZEROED (CidListSize);
-- 
cgit v1.2.3