projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'sound-asoc/for-next'
[deliverable/linux.git]
/
drivers
/
acpi
/
acpica
/
exconvrt.c
diff --git
a/drivers/acpi/acpica/exconvrt.c
b/drivers/acpi/acpica/exconvrt.c
index b7e9b3d803e169aedf7e9d3fd15b544832ce08ff..588ad1409dbe67cc629d6ac5c55715bae1a2cdc6 100644
(file)
--- a/
drivers/acpi/acpica/exconvrt.c
+++ b/
drivers/acpi/acpica/exconvrt.c
@@
-124,9
+124,9
@@
acpi_ex_convert_to_integer(union acpi_operand_object *obj_desc,
* of ACPI 3.0) is that the to_integer() operator allows both decimal
* and hexadecimal strings (hex prefixed with "0x").
*/
* of ACPI 3.0) is that the to_integer() operator allows both decimal
* and hexadecimal strings (hex prefixed with "0x").
*/
- status = acpi_ut_strtoul64(
(char *)pointer, flags
,
- acpi_gbl_integer_byte_width,
- &result);
+ status = acpi_ut_strtoul64(
ACPI_CAST_PTR(char, pointer)
,
+ (acpi_gbl_integer_byte_width |
+
flags),
&result);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
@@
-632,7
+632,7
@@
acpi_ex_convert_to_target_type(acpi_object_type destination_type,
*/
status =
acpi_ex_convert_to_integer(source_desc, result_desc,
*/
status =
acpi_ex_convert_to_integer(source_desc, result_desc,
- 16);
+
ACPI_STRTOUL_BASE
16);
break;
case ACPI_TYPE_STRING:
break;
case ACPI_TYPE_STRING:
This page took
0.027466 seconds
and
5
git commands to generate.