Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197559
b: refs/heads/master
c: 2c6719a
h: refs/heads/master
i:
  197557: 97273c5
  197555: 19bb94c
  197551: a589431
v: v3
  • Loading branch information
Julia Lawall authored and Matthew Garrett committed May 20, 2010
1 parent 46a316b commit 25d61a2
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 6c75dd0f965b7b3480d0e0e9b8d9747988dfe815
refs/heads/master: 2c6719a3ef2f7da59a622ba1176ad41d553f8f43
4 changes: 1 addition & 3 deletions trunk/drivers/platform/x86/wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -756,12 +756,10 @@ static __init acpi_status parse_wdg(acpi_handle handle)

total = obj->buffer.length / sizeof(struct guid_block);

gblock = kzalloc(obj->buffer.length, GFP_KERNEL);
gblock = kmemdup(obj->buffer.pointer, obj->buffer.length, GFP_KERNEL);
if (!gblock)
return AE_NO_MEMORY;

memcpy(gblock, obj->buffer.pointer, obj->buffer.length);

for (i = 0; i < total; i++) {
/*
Some WMI devices, like those for nVidia hooks, have a
Expand Down

0 comments on commit 25d61a2

Please sign in to comment.