Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 367598
b: refs/heads/master
c: e2cb5f0
h: refs/heads/master
v: v3
  • Loading branch information
Andrei Epure authored and Rafael J. Wysocki committed Mar 24, 2013
1 parent c5b0804 commit 2146f87
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 82160dd8ba4db5674d1d6730afe8d9b499fb7a4a
refs/heads/master: e2cb5f08469c991b187f66fa627d7673c7f3361b
5 changes: 2 additions & 3 deletions trunk/drivers/acpi/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,12 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
}
out_success:
context->ret.length = out_obj->buffer.length;
context->ret.pointer = kmalloc(context->ret.length, GFP_KERNEL);
context->ret.pointer = kmemdup(out_obj->buffer.pointer,
context->ret.length, GFP_KERNEL);
if (!context->ret.pointer) {
status = AE_NO_MEMORY;
goto out_kfree;
}
memcpy(context->ret.pointer, out_obj->buffer.pointer,
context->ret.length);
status = AE_OK;

out_kfree:
Expand Down

0 comments on commit 2146f87

Please sign in to comment.