aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/events/evrgnini.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/events/evrgnini.c')
-rw-r--r--drivers/acpi/events/evrgnini.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index a0bffc2a0787..db98747fe54d 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -75,7 +75,7 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,
75 75
76 if (function == ACPI_REGION_DEACTIVATE) { 76 if (function == ACPI_REGION_DEACTIVATE) {
77 if (*region_context) { 77 if (*region_context) {
78 ACPI_MEM_FREE(*region_context); 78 ACPI_FREE(*region_context);
79 *region_context = NULL; 79 *region_context = NULL;
80 } 80 }
81 return_ACPI_STATUS(AE_OK); 81 return_ACPI_STATUS(AE_OK);
@@ -84,7 +84,7 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,
84 /* Create a new context */ 84 /* Create a new context */
85 85
86 local_region_context = 86 local_region_context =
87 ACPI_MEM_CALLOCATE(sizeof(struct acpi_mem_space_context)); 87 ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_mem_space_context));
88 if (!(local_region_context)) { 88 if (!(local_region_context)) {
89 return_ACPI_STATUS(AE_NO_MEMORY); 89 return_ACPI_STATUS(AE_NO_MEMORY);
90 } 90 }
@@ -178,7 +178,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
178 *region_context = NULL; 178 *region_context = NULL;
179 if (function == ACPI_REGION_DEACTIVATE) { 179 if (function == ACPI_REGION_DEACTIVATE) {
180 if (pci_id) { 180 if (pci_id) {
181 ACPI_MEM_FREE(pci_id); 181 ACPI_FREE(pci_id);
182 } 182 }
183 return_ACPI_STATUS(status); 183 return_ACPI_STATUS(status);
184 } 184 }
@@ -264,7 +264,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
264 264
265 /* Region is still not initialized. Create a new context */ 265 /* Region is still not initialized. Create a new context */
266 266
267 pci_id = ACPI_MEM_CALLOCATE(sizeof(struct acpi_pci_id)); 267 pci_id = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pci_id));
268 if (!pci_id) { 268 if (!pci_id) {
269 return_ACPI_STATUS(AE_NO_MEMORY); 269 return_ACPI_STATUS(AE_NO_MEMORY);
270 } 270 }