diff options
Diffstat (limited to 'drivers/acpi/acpica/rsutils.c')
-rw-r--r-- | drivers/acpi/acpica/rsutils.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c index 37d5241c0acf..a44953c6f75d 100644 --- a/drivers/acpi/acpica/rsutils.c +++ b/drivers/acpi/acpica/rsutils.c | |||
@@ -5,7 +5,7 @@ | |||
5 | ******************************************************************************/ | 5 | ******************************************************************************/ |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * Copyright (C) 2000 - 2012, Intel Corp. | 8 | * Copyright (C) 2000 - 2013, Intel Corp. |
9 | * All rights reserved. | 9 | * All rights reserved. |
10 | * | 10 | * |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
@@ -108,7 +108,7 @@ u16 acpi_rs_encode_bitmask(u8 * list, u8 count) | |||
108 | mask |= (0x1 << list[i]); | 108 | mask |= (0x1 << list[i]); |
109 | } | 109 | } |
110 | 110 | ||
111 | return mask; | 111 | return (mask); |
112 | } | 112 | } |
113 | 113 | ||
114 | /******************************************************************************* | 114 | /******************************************************************************* |
@@ -358,8 +358,10 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length, | |||
358 | * | 358 | * |
359 | * Zero the entire area of the buffer. | 359 | * Zero the entire area of the buffer. |
360 | */ | 360 | */ |
361 | total_length = (u32) | 361 | total_length = |
362 | ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) + 1; | 362 | (u32) |
363 | ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) + | ||
364 | 1; | ||
363 | total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length); | 365 | total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length); |
364 | 366 | ||
365 | ACPI_MEMSET(resource_source->string_ptr, 0, total_length); | 367 | ACPI_MEMSET(resource_source->string_ptr, 0, total_length); |
@@ -675,7 +677,9 @@ acpi_rs_get_method_data(acpi_handle handle, | |||
675 | /* Execute the method, no parameters */ | 677 | /* Execute the method, no parameters */ |
676 | 678 | ||
677 | status = | 679 | status = |
678 | acpi_ut_evaluate_object(handle, path, ACPI_BTYPE_BUFFER, &obj_desc); | 680 | acpi_ut_evaluate_object(ACPI_CAST_PTR |
681 | (struct acpi_namespace_node, handle), path, | ||
682 | ACPI_BTYPE_BUFFER, &obj_desc); | ||
679 | if (ACPI_FAILURE(status)) { | 683 | if (ACPI_FAILURE(status)) { |
680 | return_ACPI_STATUS(status); | 684 | return_ACPI_STATUS(status); |
681 | } | 685 | } |