diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-05 23:41:06 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-05 23:41:06 (GMT) |
| commit | d1ce3bb95511dacf8b9eea899c421f1b18a3ef6a (patch) | |
| tree | 40a9215d60f1bd11ba246d1884abb1e7533327e5 /drivers/acpi/acpica/nsutils.c | |
| parent | 93d68841a23a5779cef6fb9aa0ef32e7c5bd00da (diff) | |
| parent | 878a872ead5d178b1947b480990de186529ff0b9 (diff) | |
| download | linux-d1ce3bb95511dacf8b9eea899c421f1b18a3ef6a.tar.xz | |
Merge back new ACPICA material for v4.7.
Diffstat (limited to 'drivers/acpi/acpica/nsutils.c')
| -rw-r--r-- | drivers/acpi/acpica/nsutils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c index c72cc62..784a30b 100644 --- a/drivers/acpi/acpica/nsutils.c +++ b/drivers/acpi/acpica/nsutils.c @@ -272,11 +272,11 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info) result = &internal_name[i]; } else if (num_segments == 2) { internal_name[i] = AML_DUAL_NAME_PREFIX; - result = &internal_name[(acpi_size) i + 1]; + result = &internal_name[(acpi_size)i + 1]; } else { internal_name[i] = AML_MULTI_NAME_PREFIX_OP; - internal_name[(acpi_size) i + 1] = (char)num_segments; - result = &internal_name[(acpi_size) i + 2]; + internal_name[(acpi_size)i + 1] = (char)num_segments; + result = &internal_name[(acpi_size)i + 2]; } } @@ -456,7 +456,7 @@ acpi_ns_externalize_name(u32 internal_name_length, names_index = prefix_length + 2; num_segments = (u8) - internal_name[(acpi_size) prefix_length + 1]; + internal_name[(acpi_size)prefix_length + 1]; break; case AML_DUAL_NAME_PREFIX: |