aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/acpi_pcihp.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/hotplug/acpi_pcihp.c')
-rw-r--r--drivers/pci/hotplug/acpi_pcihp.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index 39af9c325f35..64cb30d7fc9a 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -58,7 +58,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)
58 if (!ret_buf.pointer) { 58 if (!ret_buf.pointer) {
59 printk(KERN_ERR "%s:%s alloc for _HPP fail\n", 59 printk(KERN_ERR "%s:%s alloc for _HPP fail\n",
60 __FUNCTION__, (char *)string.pointer); 60 __FUNCTION__, (char *)string.pointer);
61 acpi_os_free(string.pointer); 61 kfree(string.pointer);
62 return AE_NO_MEMORY; 62 return AE_NO_MEMORY;
63 } 63 }
64 status = acpi_evaluate_object(handle, METHOD_NAME__HPP, 64 status = acpi_evaluate_object(handle, METHOD_NAME__HPP,
@@ -69,7 +69,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)
69 if (ACPI_FAILURE(status)) { 69 if (ACPI_FAILURE(status)) {
70 pr_debug("%s:%s _HPP fail=0x%x\n", __FUNCTION__, 70 pr_debug("%s:%s _HPP fail=0x%x\n", __FUNCTION__,
71 (char *)string.pointer, status); 71 (char *)string.pointer, status);
72 acpi_os_free(string.pointer); 72 kfree(string.pointer);
73 return status; 73 return status;
74 } 74 }
75 } 75 }
@@ -109,8 +109,8 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)
109 pr_debug(" _HPP: enable PERR =0x%x\n", hpp->enable_perr); 109 pr_debug(" _HPP: enable PERR =0x%x\n", hpp->enable_perr);
110 110
111free_and_return: 111free_and_return:
112 acpi_os_free(string.pointer); 112 kfree(string.pointer);
113 acpi_os_free(ret_buf.pointer); 113 kfree(ret_buf.pointer);
114 return status; 114 return status;
115} 115}
116 116
@@ -136,7 +136,7 @@ acpi_status acpi_run_oshp(acpi_handle handle)
136 pr_debug("%s:%s OSHP passes\n", __FUNCTION__, 136 pr_debug("%s:%s OSHP passes\n", __FUNCTION__,
137 (char *)string.pointer); 137 (char *)string.pointer);
138 138
139 acpi_os_free(string.pointer); 139 kfree(string.pointer);
140 return status; 140 return status;
141} 141}
142EXPORT_SYMBOL_GPL(acpi_run_oshp); 142EXPORT_SYMBOL_GPL(acpi_run_oshp);
@@ -192,19 +192,19 @@ int acpi_root_bridge(acpi_handle handle)
192 if ((info->valid & ACPI_VALID_HID) && 192 if ((info->valid & ACPI_VALID_HID) &&
193 !strcmp(PCI_ROOT_HID_STRING, 193 !strcmp(PCI_ROOT_HID_STRING,
194 info->hardware_id.value)) { 194 info->hardware_id.value)) {
195 acpi_os_free(buffer.pointer); 195 kfree(buffer.pointer);
196 return 1; 196 return 1;
197 } 197 }
198 if (info->valid & ACPI_VALID_CID) { 198 if (info->valid & ACPI_VALID_CID) {
199 for (i=0; i < info->compatibility_id.count; i++) { 199 for (i=0; i < info->compatibility_id.count; i++) {
200 if (!strcmp(PCI_ROOT_HID_STRING, 200 if (!strcmp(PCI_ROOT_HID_STRING,
201 info->compatibility_id.id[i].value)) { 201 info->compatibility_id.id[i].value)) {
202 acpi_os_free(buffer.pointer); 202 kfree(buffer.pointer);
203 return 1; 203 return 1;
204 } 204 }
205 } 205 }
206 } 206 }
207 acpi_os_free(buffer.pointer); 207 kfree(buffer.pointer);
208 } 208 }
209 return 0; 209 return 0;
210} 210}