Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / acpi / executer / exprep.c

diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 3a2f8cd4c62a9bffc6d27c25ed2b4bff3c112c0c..5d438c32989d892be3d41b08e738c167ff1ad3c2 100644 (file)
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -503,11 +503,11 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
                 */
                second_desc = obj_desc->common.next_object;
                second_desc->extra.aml_start =
-                   ((union acpi_parse_object *)(info->data_register_node))->
-                   named.data;
+                   ACPI_CAST_PTR(union acpi_parse_object,
+                                 info->data_register_node)->named.data;
                second_desc->extra.aml_length =
-                   ((union acpi_parse_object *)(info->data_register_node))->
-                   named.length;
+                   ACPI_CAST_PTR(union acpi_parse_object,
+                                 info->data_register_node)->named.length;
 
                break;