aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-17 10:58:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-17 10:58:38 -0700
commitd6f533c8c7a4d83ed1c075f919a68031b9c67185 (patch)
tree5638abd7b9aa98d300148dd76f4f2f800fb5a16e /drivers
parent65832940eb74dca5ef1c8df086540825a00ad0c8 (diff)
parentbc3966921ff9528ae44a4a108085ab06107c1e7d (diff)
downloadmrst-s0i3-test-d6f533c8c7a4d83ed1c075f919a68031b9c67185.tar.gz
mrst-s0i3-test-d6f533c8c7a4d83ed1c075f919a68031b9c67185.tar.xz
mrst-s0i3-test-d6f533c8c7a4d83ed1c075f919a68031b9c67185.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: EC: Limit burst to 64 bits
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/acpica/exprep.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index a610ebe18ed..2fbfe51fb14 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -471,13 +471,18 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info)
/* allow full data read from EC address space */
if (obj_desc->field.region_obj->region.space_id ==
ACPI_ADR_SPACE_EC) {
- if (obj_desc->common_field.bit_length > 8)
- obj_desc->common_field.access_bit_width =
- ACPI_ROUND_UP(obj_desc->common_field.
- bit_length, 8);
+ if (obj_desc->common_field.bit_length > 8) {
+ unsigned width =
+ ACPI_ROUND_BITS_UP_TO_BYTES(
+ obj_desc->common_field.bit_length);
+ // access_bit_width is u8, don't overflow it
+ if (width > 8)
+ width = 8;
obj_desc->common_field.access_byte_width =
- ACPI_DIV_8(obj_desc->common_field.
- access_bit_width);
+ width;
+ obj_desc->common_field.access_bit_width =
+ 8 * width;
+ }
}
ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,