summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorErik Schmauss <erik.schmauss@intel.com>2017-11-17 15:40:15 -0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-27 01:20:28 +0100
commit5c74663e20bca25fa37d4d488265367b8d6b975f (patch)
treec13736e841087e649b39491a1e542c854f787850 /drivers/acpi
parent8f275615a623183584b1604789cdcb240342ffbc (diff)
downloadlinux-5c74663e20bca25fa37d4d488265367b8d6b975f.tar.gz
linux-5c74663e20bca25fa37d4d488265367b8d6b975f.tar.bz2
linux-5c74663e20bca25fa37d4d488265367b8d6b975f.zip
ACPICA: Disassembler: reset parser_state's Aml pointer when parsing bad externals
ACPICA commit e7e25137471d7f75960fdb8caf757db0426245ca Link: https://github.com/acpica/acpica/commit/e7e25137 Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/psobject.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/psobject.c b/drivers/acpi/acpica/psobject.c
index 0bef6df71bba..8cbe36159376 100644
--- a/drivers/acpi/acpica/psobject.c
+++ b/drivers/acpi/acpica/psobject.c
@@ -382,6 +382,7 @@ acpi_ps_create_op(struct acpi_walk_state *walk_state,
walk_state->aml -
walk_state->parser_state.aml_start);
walk_state->aml = walk_state->parser_state.aml + 2;
+ walk_state->parser_state.aml = walk_state->aml;
return_ACPI_STATUS(AE_CTRL_PARSE_CONTINUE);
}
#endif