redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[ACPI] fix EC access width

Browse source 
http://bugzilla.kernel.org/show_bug.cgi?id=4346

Written-by: David Shaohua Li and Luming Yu
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Luming Yu 2005-03-19 01:54:47 -05:00 committed by Len Brown
parent 451566f45a
commit fa9cd547e0
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/acpi/ec.c
View file

@ -600,7 +600,7 @@ acpi_ec_space_handler (
{ {
int result = 0; int result = 0;
struct acpi_ec *ec = NULL; struct acpi_ec *ec = NULL;
u32 temp = 0; u64 temp = *value;
acpi_integer f_v = 0; acpi_integer f_v = 0;
int i = 0; int i = 0;
@ -609,10 +609,9 @@ acpi_ec_space_handler (
if ((address > 0xFF) || !value || !handler_context) if ((address > 0xFF) || !value || !handler_context)
return_VALUE(AE_BAD_PARAMETER); return_VALUE(AE_BAD_PARAMETER);
if(bit_width != 8) { if (bit_width != 8 && acpi_strict) {
printk(KERN_WARNING PREFIX "acpi_ec_space_handler: bit_width should be 8\n"); printk(KERN_WARNING PREFIX "acpi_ec_space_handler: bit_width should be 8\n");
if (acpi_strict) return_VALUE(AE_BAD_PARAMETER);
return_VALUE(AE_BAD_PARAMETER);
} }
ec = (struct acpi_ec *) handler_context; ec = (struct acpi_ec *) handler_context;
@ -620,11 +619,11 @@ acpi_ec_space_handler (
next_byte: next_byte:
switch (function) { switch (function) {
case ACPI_READ: case ACPI_READ:
result = acpi_ec_read(ec, (u8) address, &temp); temp = 0;
*value = (acpi_integer) temp; result = acpi_ec_read(ec, (u8) address, (u32 *)&temp);
break; break;
case ACPI_WRITE: case ACPI_WRITE:
result = acpi_ec_write(ec, (u8) address, (u8) *value); result = acpi_ec_write(ec, (u8) address, (u8) temp);
break; break;
default: default:
result = -EINVAL; result = -EINVAL;
@ -633,19 +632,18 @@ next_byte:
} }
bit_width -= 8; bit_width -= 8;
if(bit_width){ if (bit_width) {
if (function == ACPI_READ)
if(function == ACPI_READ) f_v |= temp << 8 * i;
f_v |= (acpi_integer) (*value) << 8*i; if (function == ACPI_WRITE)
if(function == ACPI_WRITE) temp >>= 8;
(*value) >>=8;
i++; i++;
(u8)address ++;
goto next_byte; goto next_byte;
} }
if (function == ACPI_READ) {
if(function == ACPI_READ){ f_v |= temp << 8 * i;
f_v |= (acpi_integer) (*value) << 8*i;
*value = f_v; *value = f_v;
} }
@ -664,8 +662,6 @@ out:
default: default:
return_VALUE(AE_OK); return_VALUE(AE_OK);
} }
} }