vendor/acpica/20121018

9 files changed, 13 insertions, 15 deletions

diff --git a/source/components/resources/rsaddr.c b/source/components/resources/rsaddr.c
index 90e7d43b6e01e..14e59e341fbd9 100644
--- a/source/components/resources/rsaddr.c
+++ b/source/components/resources/rsaddr.c
@@ -403,5 +403,3 @@ AcpiRsSetAddressCommon (
         Aml->Address.SpecificFlags = Resource->Data.Address.Info.TypeSpecific;
     }
 }
-
-
diff --git a/source/components/resources/rscalc.c b/source/components/resources/rscalc.c
index 845ed69c7deeb..12af85ea30ced 100644
--- a/source/components/resources/rscalc.c
+++ b/source/components/resources/rscalc.c
@@ -482,6 +482,16 @@ AcpiRsGetListLength (
              * Get the number of vendor data bytes
              */
             ExtraStructBytes = ResourceLength;
+
+            /*
+             * There is already one byte included in the minimum
+             * descriptor size. If there are extra struct bytes,
+             * subtract one from the count.
+             */
+            if (ExtraStructBytes)
+            {
+                ExtraStructBytes--;
+            }
             break;
 
 
@@ -626,7 +636,7 @@ AcpiRsGetPciRoutingTableLength (
     /*
      * Calculate the size of the return buffer.
      * The base size is the number of elements * the sizes of the
-     * structures.  Additional space for the strings is added below.
+     * structures. Additional space for the strings is added below.
      * The minus one is to subtract the size of the UINT8 Source[1]
      * member because it is added below.
      *
diff --git a/source/components/resources/rscreate.c b/source/components/resources/rscreate.c
index dcfe7e4361746..4c444cedd60d2 100644
--- a/source/components/resources/rscreate.c
+++ b/source/components/resources/rscreate.c
@@ -531,4 +531,3 @@ AcpiRsCreateAmlResources (
             OutputBuffer->Pointer, (UINT32) OutputBuffer->Length));
     return_ACPI_STATUS (AE_OK);
 }
-
diff --git a/source/components/resources/rsdump.c b/source/components/resources/rsdump.c
index 68564739eb5ed..6e2013253e716 100644
--- a/source/components/resources/rsdump.c
+++ b/source/components/resources/rsdump.c
@@ -943,4 +943,3 @@ AcpiRsDumpWordList (
 }
 
 #endif
-
diff --git a/source/components/resources/rsio.c b/source/components/resources/rsio.c
index 065108cfa1f78..83046273e5431 100644
--- a/source/components/resources/rsio.c
+++ b/source/components/resources/rsio.c
@@ -300,5 +300,3 @@ ACPI_RSCONVERT_INFO   AcpiRsSetStartDpf[10] =
 
     {ACPI_RSC_LENGTH,   0, 0, sizeof (AML_RESOURCE_START_DEPENDENT_NOPRIO)}
 };
-
-
diff --git a/source/components/resources/rslist.c b/source/components/resources/rslist.c
index 187d56cd42b29..c5aeb1b91797a 100644
--- a/source/components/resources/rslist.c
+++ b/source/components/resources/rslist.c
@@ -125,7 +125,7 @@ AcpiRsConvertAmlToResources (
         ACPI_ERROR ((AE_INFO,
             "Invalid/unsupported resource descriptor: Type 0x%2.2X",
             ResourceIndex));
-        return (AE_AML_INVALID_RESOURCE_TYPE);
+        return_ACPI_STATUS (AE_AML_INVALID_RESOURCE_TYPE);
     }
 
      /* Convert the AML byte stream resource to a local resource struct */
@@ -225,7 +225,7 @@ AcpiRsConvertResourcesToAml (
             ACPI_ERROR ((AE_INFO,
                 "Invalid/unsupported resource descriptor: Type 0x%2.2X",
                 Resource->Type));
-            return (AE_AML_INVALID_RESOURCE_TYPE);
+            return_ACPI_STATUS (AE_AML_INVALID_RESOURCE_TYPE);
         }
 
         Status = AcpiRsConvertResourceToAml (Resource,
@@ -272,4 +272,3 @@ AcpiRsConvertResourcesToAml (
 
     return_ACPI_STATUS (AE_AML_NO_RESOURCE_END_TAG);
 }
-
diff --git a/source/components/resources/rsmemory.c b/source/components/resources/rsmemory.c
index 83d131956ff70..b9452f25c42fb 100644
--- a/source/components/resources/rsmemory.c
+++ b/source/components/resources/rsmemory.c
@@ -247,5 +247,3 @@ ACPI_RSCONVERT_INFO     AcpiRsSetVendor[7] =
                         sizeof (AML_RESOURCE_LARGE_HEADER),
                         0}
 };
-
-
diff --git a/source/components/resources/rsmisc.c b/source/components/resources/rsmisc.c
index dfad696ca1d18..673492887d70c 100644
--- a/source/components/resources/rsmisc.c
+++ b/source/components/resources/rsmisc.c
@@ -865,5 +865,3 @@ Exit:
         return_ACPI_STATUS (AE_BAD_DATA);
     }
 #endif
-
-
diff --git a/source/components/resources/rsutils.c b/source/components/resources/rsutils.c
index 273638f3f4fc9..aeac5e70b0bdd 100644
--- a/source/components/resources/rsutils.c
+++ b/source/components/resources/rsutils.c
@@ -858,4 +858,3 @@ Cleanup:
     ACPI_FREE (Info);
     return_ACPI_STATUS (Status);
 }
-