diff options
Diffstat (limited to 'drivers/acpi/executer/exoparg3.c')
| -rw-r--r-- | drivers/acpi/executer/exoparg3.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c index 8da794ec35b0..4897e6c3431f 100644 --- a/drivers/acpi/executer/exoparg3.c +++ b/drivers/acpi/executer/exoparg3.c | |||
| @@ -100,8 +100,7 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state) | |||
| 100 | (u32) operand[1]->integer.value, | 100 | (u32) operand[1]->integer.value, |
| 101 | (u32) operand[2]->integer.value)); | 101 | (u32) operand[2]->integer.value)); |
| 102 | 102 | ||
| 103 | fatal = | 103 | fatal = ACPI_ALLOCATE(sizeof(struct acpi_signal_fatal_info)); |
| 104 | ACPI_MEM_ALLOCATE(sizeof(struct acpi_signal_fatal_info)); | ||
| 105 | if (fatal) { | 104 | if (fatal) { |
| 106 | fatal->type = (u32) operand[0]->integer.value; | 105 | fatal->type = (u32) operand[0]->integer.value; |
| 107 | fatal->code = (u32) operand[1]->integer.value; | 106 | fatal->code = (u32) operand[1]->integer.value; |
| @@ -114,7 +113,7 @@ acpi_status acpi_ex_opcode_3A_0T_0R(struct acpi_walk_state *walk_state) | |||
| 114 | 113 | ||
| 115 | /* Might return while OS is shutting down, just continue */ | 114 | /* Might return while OS is shutting down, just continue */ |
| 116 | 115 | ||
| 117 | ACPI_MEM_FREE(fatal); | 116 | ACPI_FREE(fatal); |
| 118 | break; | 117 | break; |
| 119 | 118 | ||
| 120 | default: | 119 | default: |
| @@ -196,7 +195,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state) | |||
| 196 | 195 | ||
| 197 | /* Always allocate a new buffer for the String */ | 196 | /* Always allocate a new buffer for the String */ |
| 198 | 197 | ||
| 199 | buffer = ACPI_MEM_CALLOCATE((acpi_size) length + 1); | 198 | buffer = ACPI_ALLOCATE_ZEROED((acpi_size) length + 1); |
| 200 | if (!buffer) { | 199 | if (!buffer) { |
| 201 | status = AE_NO_MEMORY; | 200 | status = AE_NO_MEMORY; |
| 202 | goto cleanup; | 201 | goto cleanup; |
| @@ -211,7 +210,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state) | |||
| 211 | 210 | ||
| 212 | /* Allocate a new buffer for the Buffer */ | 211 | /* Allocate a new buffer for the Buffer */ |
| 213 | 212 | ||
| 214 | buffer = ACPI_MEM_CALLOCATE(length); | 213 | buffer = ACPI_ALLOCATE_ZEROED(length); |
| 215 | if (!buffer) { | 214 | if (!buffer) { |
| 216 | status = AE_NO_MEMORY; | 215 | status = AE_NO_MEMORY; |
| 217 | goto cleanup; | 216 | goto cleanup; |