Merge branch 'topic/drvdata-fix' into topic/asoc

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
index b6667ff059e5..88b5a2c4814d 100644
--- a/drivers/acpi/acpica/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -543,6 +543,13 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
 
                 package_element = *top_object_list;
 
+                /* We must have a valid Package object */
+
+                if (!package_element ||
+                    (package_element->common.type != ACPI_TYPE_PACKAGE)) {
+                        return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                }
+
                 /*
                  * The sub_object_list will now point to an array of the
                  * four IRQ elements: Address, Pin, Source and source_index