diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-24 01:35:33 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-24 01:35:33 -0400 |
| commit | 04a2e6297df5ff04ddfbd6f2bdeefc218195ce96 (patch) | |
| tree | f624be2501c940d7cbc1bef75aa26f5179b74379 /drivers/acpi | |
| parent | ac0849fb6c66ca865270fda32bcbc39f6dd52de1 (diff) | |
| parent | 82babbb3887e234c995626e4121d411ea9070ca5 (diff) | |
| download | kernel_samsung_tuna-04a2e6297df5ff04ddfbd6f2bdeefc218195ce96.zip kernel_samsung_tuna-04a2e6297df5ff04ddfbd6f2bdeefc218195ce96.tar.gz kernel_samsung_tuna-04a2e6297df5ff04ddfbd6f2bdeefc218195ce96.tar.bz2 | |
Merge branch 'bugzilla-12270' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/rscreate.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c index 663f692..a3c23d6 100644 --- a/drivers/acpi/acpica/rscreate.c +++ b/drivers/acpi/acpica/rscreate.c @@ -191,8 +191,6 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object, user_prt = ACPI_CAST_PTR(struct acpi_pci_routing_table, buffer); for (index = 0; index < number_of_elements; index++) { - int source_name_index = 2; - int source_index_index = 3; /* * Point user_prt past this current structure @@ -261,27 +259,6 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object, return_ACPI_STATUS(AE_BAD_DATA); } - /* - * If BIOS erroneously reversed the _PRT source_name and source_index, - * then reverse them back. - */ - if ((sub_object_list[3])->common.type != - ACPI_TYPE_INTEGER) { - if (acpi_gbl_enable_interpreter_slack) { - source_name_index = 3; - source_index_index = 2; - printk(KERN_WARNING - "ACPI: Handling Garbled _PRT entry\n"); - } else { - ACPI_ERROR((AE_INFO, - "(PRT[%X].source_index) Need Integer, found %s", - index, - acpi_ut_get_object_type_name - (sub_object_list[3]))); - return_ACPI_STATUS(AE_BAD_DATA); - } - } - user_prt->pin = (u32) obj_desc->integer.value; /* @@ -304,7 +281,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object, * 3) Third subobject: Dereference the PRT.source_name * The name may be unresolved (slack mode), so allow a null object */ - obj_desc = sub_object_list[source_name_index]; + obj_desc = sub_object_list[2]; if (obj_desc) { switch (obj_desc->common.type) { case ACPI_TYPE_LOCAL_REFERENCE: @@ -378,7 +355,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object, /* 4) Fourth subobject: Dereference the PRT.source_index */ - obj_desc = sub_object_list[source_index_index]; + obj_desc = sub_object_list[3]; if (obj_desc->common.type != ACPI_TYPE_INTEGER) { ACPI_ERROR((AE_INFO, "(PRT[%X].SourceIndex) Need Integer, found %s", |