From 496c59ef87a563e56c00cdb40628475e7966e734 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 19 May 2010 10:11:14 -0700 Subject: [PATCH] --- yaml --- r: 193541 b: refs/heads/master c: f8300ab8c3e0bea42c82bbdcdff7b791b795d58f h: refs/heads/master i: 193539: 5049d957886e4a9f602f9b7873a10f055e508591 v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/wistron_btns.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1a778ddbb8a2..993a405faf35 100644 --- 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 index 04d5a4a3181f..4dac8b79fcd4 100644 --- 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;