projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
acpi
/
acpica
/
rsutils.c
diff --git
a/drivers/acpi/acpica/rsutils.c
b/drivers/acpi/acpica/rsutils.c
index 37d5241c0acf731d2581bb51f68c84f5ae4643d5..a44953c6f75da74d7c0e160078eff90b5abfc5ba 100644
(file)
--- a/
drivers/acpi/acpica/rsutils.c
+++ b/
drivers/acpi/acpica/rsutils.c
@@
-5,7
+5,7
@@
******************************************************************************/
/*
******************************************************************************/
/*
- * Copyright (C) 2000 - 201
2
, Intel Corp.
+ * Copyright (C) 2000 - 201
3
, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-108,7
+108,7
@@
u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
mask |= (0x1 << list[i]);
}
mask |= (0x1 << list[i]);
}
- return
mask
;
+ return
(mask)
;
}
/*******************************************************************************
}
/*******************************************************************************
@@
-358,8
+358,10
@@
acpi_rs_get_resource_source(acpi_rs_length resource_length,
*
* Zero the entire area of the buffer.
*/
*
* Zero the entire area of the buffer.
*/
- total_length = (u32)
- ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) + 1;
+ total_length =
+ (u32)
+ ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) +
+ 1;
total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);
ACPI_MEMSET(resource_source->string_ptr, 0, total_length);
total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);
ACPI_MEMSET(resource_source->string_ptr, 0, total_length);
@@
-675,7
+677,9
@@
acpi_rs_get_method_data(acpi_handle handle,
/* Execute the method, no parameters */
status =
/* Execute the method, no parameters */
status =
- acpi_ut_evaluate_object(handle, path, ACPI_BTYPE_BUFFER, &obj_desc);
+ acpi_ut_evaluate_object(ACPI_CAST_PTR
+ (struct acpi_namespace_node, handle), path,
+ ACPI_BTYPE_BUFFER, &obj_desc);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}