aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/psloop.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 06:58:14 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 06:58:14 -0400
commit80338681bbc5786fa1342d3b7f021c1d8974ac62 (patch)
tree90cdacbab0695fcb8b0f5ad9f484e5a5f6751ecf /drivers/acpi/acpica/psloop.c
parenta204dbc61b7f4cb1a7e2cb3ad057b135164782da (diff)
parent069189a1c8e897be8c9d8f2365c30a6497100519 (diff)
Merge branch 'acpica'
* acpica: (21 commits) ACPICA: Update version to 20130517 ACPICA: _CST repair: Handle null package entries ACPICA: Add several repairs for _CST predefined name ACPICA: Move _PRT repair into the standard complex repair module ACPICA: Clear events initialized flag upon event component termination ACPICA: Fix possible memory leak in GPE init error path ACPICA: ACPICA Termination: Delete global lock pending lock ACPICA: Update interface to acpi_ut_valid_acpi_name() ACPICA: Do not use extended sleep registers unless HW-reduced bit is set ACPICA: Split table print utilities to a new a separate file ACPICA: Add option to disable loading of SSDTs from the RSDT/XSDT ACPICA: Standardize all switch() blocks ACPICA: Split internal error msg routines to a separate file ACPICA: Split buffer dump routines into separate file ACPICA: Update version to 20130418 ACPICA: Update for "orphan" embedded controller _REG method support ACPICA: Remove unused macros, no functional change ACPICA: Predefined name support: Remove unused local variable ACPICA: Add argument typechecking for all predefined ACPI names ACPICA: Add BIOS error interface for predefined name validation support ...
Diffstat (limited to 'drivers/acpi/acpica/psloop.c')
-rw-r--r--drivers/acpi/acpica/psloop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 63c455447481..065b44ae538f 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -164,7 +164,6 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
164 case AML_IF_OP: 164 case AML_IF_OP:
165 case AML_ELSE_OP: 165 case AML_ELSE_OP:
166 case AML_WHILE_OP: 166 case AML_WHILE_OP:
167
168 /* 167 /*
169 * Currently supported module-level opcodes are: 168 * Currently supported module-level opcodes are:
170 * IF/ELSE/WHILE. These appear to be the most common, 169 * IF/ELSE/WHILE. These appear to be the most common,
@@ -289,6 +288,7 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
289 default: 288 default:
290 289
291 /* No action for all other opcodes */ 290 /* No action for all other opcodes */
291
292 break; 292 break;
293 } 293 }
294 294