aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Epure <epure.andrei@gmail.com>2013-03-11 04:20:16 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-03-24 18:31:33 -0400
commite2cb5f08469c991b187f66fa627d7673c7f3361b (patch)
tree0b31ae4416e8c1f0a3dc40e35a6469566ce438fa
parent82160dd8ba4db5674d1d6730afe8d9b499fb7a4a (diff)
ACPI: replace kmalloc+memcpy with kmemdup
Replace the combination of kmalloc() and memcpy() in acpi_run_osc() with a single call to kmemdup(). [rjw: Changelog] Signed-off-by: Andrei Epure <epure.andrei@gmail.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/bus.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 01708a165368..292de3cab9cc 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -288,13 +288,12 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
288 } 288 }
289out_success: 289out_success:
290 context->ret.length = out_obj->buffer.length; 290 context->ret.length = out_obj->buffer.length;
291 context->ret.pointer = kmalloc(context->ret.length, GFP_KERNEL); 291 context->ret.pointer = kmemdup(out_obj->buffer.pointer,
292 context->ret.length, GFP_KERNEL);
292 if (!context->ret.pointer) { 293 if (!context->ret.pointer) {
293 status = AE_NO_MEMORY; 294 status = AE_NO_MEMORY;
294 goto out_kfree; 295 goto out_kfree;
295 } 296 }
296 memcpy(context->ret.pointer, out_obj->buffer.pointer,
297 context->ret.length);
298 status = AE_OK; 297 status = AE_OK;
299 298
300out_kfree: 299out_kfree: