Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

[pandora-kernel.git] / drivers / input / misc / wistron_btns.c

diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index 04d5a4a..4dac8b7 100644 (file)
--- a/drivers/input/misc/wistron_btns.c
+++ b/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;