ACPICA: Fixes for size of StartDependent resource descriptor

Fixed a couple of size calculation issues with the variable-length
Start Dependent resource descriptor.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index db0a835e3317ec1b408e78203146400d718e36e3..d801823de01605b338631ac0d7907f87a5db5e80 100644 (file)
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -213,11 +213,22 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
                switch (resource->type) {
                case ACPI_RESOURCE_TYPE_IRQ:
 
+                       /* Length can be 3 or 2 */
+
                        if (resource->data.irq.descriptor_length == 2) {
                                total_size--;
                        }
                        break;
 
+               case ACPI_RESOURCE_TYPE_START_DEPENDENT:
+
+                       /* Length can be 1 or 0 */
+
+                       if (resource->data.irq.descriptor_length == 0) {
+                               total_size--;
+                       }
+                       break;
+
                case ACPI_RESOURCE_TYPE_VENDOR:
                        /*
                         * Vendor Defined Resource:

diff --git a/drivers/acpi/resources/rsio.c b/drivers/acpi/resources/rsio.c
index 50f3acdd9c8e0c1b93833b9fd8109c4826e96ee6..610d7c2101f211a66c9470441a917afe1837b9d3 100644 (file)
--- a/drivers/acpi/resources/rsio.c
+++ b/drivers/acpi/resources/rsio.c
@@ -268,7 +268,7 @@ struct acpi_rsconvert_info acpi_rs_set_start_dpf[10] = {
 
        /* Reset length to 1 byte (descriptor with flags byte) */
 
-       {ACPI_RSC_LENGTH, 0, 0, sizeof(struct aml_resource_irq)},
+       {ACPI_RSC_LENGTH, 0, 0, sizeof(struct aml_resource_start_dependent)},
 
        /*
         * All done if flags byte is necessary -- if either priority value