diff options
Diffstat (limited to 'drivers/acpi/acpica/dsfield.c')
-rw-r--r-- | drivers/acpi/acpica/dsfield.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c index 54a225e56a64..bb13817e0c31 100644 --- a/drivers/acpi/acpica/dsfield.c +++ b/drivers/acpi/acpica/dsfield.c | |||
@@ -5,7 +5,7 @@ | |||
5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * Copyright (C) 2000 - 2008, Intel Corp. | 8 | * Copyright (C) 2000 - 2010, Intel Corp. |
9 | * All rights reserved. | 9 | * All rights reserved. |
10 | * | 10 | * |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
@@ -220,7 +220,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info, | |||
220 | union acpi_parse_object *arg) | 220 | union acpi_parse_object *arg) |
221 | { | 221 | { |
222 | acpi_status status; | 222 | acpi_status status; |
223 | acpi_integer position; | 223 | u64 position; |
224 | 224 | ||
225 | ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info); | 225 | ACPI_FUNCTION_TRACE_PTR(ds_get_field_names, info); |
226 | 226 | ||
@@ -240,8 +240,8 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info, | |||
240 | switch (arg->common.aml_opcode) { | 240 | switch (arg->common.aml_opcode) { |
241 | case AML_INT_RESERVEDFIELD_OP: | 241 | case AML_INT_RESERVEDFIELD_OP: |
242 | 242 | ||
243 | position = (acpi_integer) info->field_bit_position | 243 | position = (u64) info->field_bit_position |
244 | + (acpi_integer) arg->common.value.size; | 244 | + (u64) arg->common.value.size; |
245 | 245 | ||
246 | if (position > ACPI_UINT32_MAX) { | 246 | if (position > ACPI_UINT32_MAX) { |
247 | ACPI_ERROR((AE_INFO, | 247 | ACPI_ERROR((AE_INFO, |
@@ -305,8 +305,8 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info, | |||
305 | 305 | ||
306 | /* Keep track of bit position for the next field */ | 306 | /* Keep track of bit position for the next field */ |
307 | 307 | ||
308 | position = (acpi_integer) info->field_bit_position | 308 | position = (u64) info->field_bit_position |
309 | + (acpi_integer) arg->common.value.size; | 309 | + (u64) arg->common.value.size; |
310 | 310 | ||
311 | if (position > ACPI_UINT32_MAX) { | 311 | if (position > ACPI_UINT32_MAX) { |
312 | ACPI_ERROR((AE_INFO, | 312 | ACPI_ERROR((AE_INFO, |