diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-15 22:27:39 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-15 22:27:39 -0500 |
| commit | 173cc11a6e10c38ff7d4949b48e8d2eb0aee3e05 (patch) | |
| tree | 44ac9a6fe4e9c51b2c54918aa338df7eda96b0a5 /drivers/acpi/acpica/dsmethod.c | |
| parent | 8bea8672edfca7ec5f661cafb218f1205863b343 (diff) | |
| parent | 88e5071525ad6814be3a8a2792ce9e81a0cca22a (diff) | |
Merge branch 'acpica' into release
Diffstat (limited to 'drivers/acpi/acpica/dsmethod.c')
| -rw-r--r-- | drivers/acpi/acpica/dsmethod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c index 567a4899a018..e786f9fd767f 100644 --- a/drivers/acpi/acpica/dsmethod.c +++ b/drivers/acpi/acpica/dsmethod.c | |||
| @@ -414,7 +414,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, | |||
| 414 | /* Invoke an internal method if necessary */ | 414 | /* Invoke an internal method if necessary */ |
| 415 | 415 | ||
| 416 | if (obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) { | 416 | if (obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) { |
| 417 | status = obj_desc->method.implementation(next_walk_state); | 417 | status = obj_desc->method.extra.implementation(next_walk_state); |
| 418 | if (status == AE_OK) { | 418 | if (status == AE_OK) { |
| 419 | status = AE_CTRL_TERMINATE; | 419 | status = AE_CTRL_TERMINATE; |
| 420 | } | 420 | } |