---

yaml --- r: 193541 b: refs/heads/master c: f8300ab h: refs/heads/master i: 193539: 5049d95 v: v3
git-mirror · May 19, 2010 · 496c59e · 496c59e
1 parent 037258c
commit 496c59e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 641d446f89314d19fe17fcb9f19659a09fabe418
+refs/heads/master: f8300ab8c3e0bea42c82bbdcdff7b791b795d58f
diff --git a/trunk/drivers/input/misc/wistron_btns.c b/trunk/drivers/input/misc/wistron_btns.c
@@ -983,11 +983,11 @@ static int __init copy_keymap(void)
 	for (key = keymap; key->type != KE_END; key++)
 		length++;
 
-	new_keymap = kmalloc(length * sizeof(struct key_entry), GFP_KERNEL);
+	new_keymap = kmemdup(keymap, length * sizeof(struct key_entry),
+			     GFP_KERNEL);
 	if (!new_keymap)
 		return -ENOMEM;
 
-	memcpy(new_keymap, keymap, length * sizeof(struct key_entry));
 	keymap = new_keymap;
 
 	return 0;