From 25d61a20aec9ec5ce68d95eb2ff92acfcc73b003 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 15 May 2010 23:22:18 +0200 Subject: [PATCH] --- yaml --- r: 197559 b: refs/heads/master c: 2c6719a3ef2f7da59a622ba1176ad41d553f8f43 h: refs/heads/master i: 197557: 97273c5610a0c3dc85e88eee8d95dd70dd4137c8 197555: 19bb94cd8b2358ff6f5cc3ac492fd87c70ca0c2c 197551: a5894311e00af6aec20a0a3756dc77e0d1949401 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/wmi.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dbcf87fc2a7a..37a950b7653f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c75dd0f965b7b3480d0e0e9b8d9747988dfe815 +refs/heads/master: 2c6719a3ef2f7da59a622ba1176ad41d553f8f43 diff --git a/trunk/drivers/platform/x86/wmi.c b/trunk/drivers/platform/x86/wmi.c index 39ec5b6c2e3a..17df134a6f03 100644 --- a/trunk/drivers/platform/x86/wmi.c +++ b/trunk/drivers/platform/x86/wmi.c @@ -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