summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/dsutils.c
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2015-12-29 13:52:32 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-01 03:26:44 +0100
commit5431b6543fb45f6c61dbb1394c918f3bc5acefae (patch)
treef650faee3089b7860f203f96ea3cc61b1a19c49d /drivers/acpi/acpica/dsutils.c
parentb17629dbf72d0718e88190d7f0a1d54be044799c (diff)
downloadlinux-stable-5431b6543fb45f6c61dbb1394c918f3bc5acefae.tar.gz
linux-stable-5431b6543fb45f6c61dbb1394c918f3bc5acefae.tar.bz2
linux-stable-5431b6543fb45f6c61dbb1394c918f3bc5acefae.zip
ACPICA: Linuxize: reduce divergences for 20151218 release
The patch reduces source code differences between the Linux kernel and the ACPICA upstream so that the linuxized ACPICA 20151218 release can be applied with reduced human intervention. The pscode.c has already been out of sync for months, and it becomes more and more difficult to merge pscode.c changes, so instead of update the affected lines of pscode.c, this patch synchronizes entire pscode.c file. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/dsutils.c')
-rw-r--r--drivers/acpi/acpica/dsutils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index e4293a8794ea..cecba391d4fc 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -504,8 +504,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
if ((walk_state->deferred_node) &&
(walk_state->deferred_node->type == ACPI_TYPE_BUFFER_FIELD)
&& (arg_index ==
- (u32) ((walk_state->opcode ==
- AML_CREATE_FIELD_OP) ? 3 : 2))) {
+ (u32)((walk_state->opcode ==
+ AML_CREATE_FIELD_OP) ? 3 : 2))) {
obj_desc =
ACPI_CAST_PTR(union acpi_operand_object,
walk_state->deferred_node);