Staging: b3dfg: remove check for pci bus master

[safe/jmp/linux-2.6] / drivers / acpi / acpica / rscalc.c

diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
index b6667ff..3c4dcc3 100644 (file)
--- 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
@@ -586,9 +593,6 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
                        } else {
                                temp_size_needed +=
                                    acpi_ns_get_pathname_length((*sub_object_list)->reference.node);
-                               if (!temp_size_needed) {
-                                       return_ACPI_STATUS(AE_BAD_PARAMETER);
-                               }
                        }
                } else {
                        /*