diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-19 13:11:14 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:14:38 -0400 |
commit | f8300ab8c3e0bea42c82bbdcdff7b791b795d58f (patch) | |
tree | 259f14af19298ab2f6dcd5ff7dd3b645259fe975 /drivers/input | |
parent | 641d446f89314d19fe17fcb9f19659a09fabe418 (diff) |
Input: wistron_btns - switch to using kmemdup()
Use kmemdup when some other buffer is immediately copied into the
allocated region.
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/misc/wistron_btns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index 04d5a4a3181f..4dac8b79fcd4 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c | |||
@@ -983,11 +983,11 @@ static int __init copy_keymap(void) | |||
983 | for (key = keymap; key->type != KE_END; key++) | 983 | for (key = keymap; key->type != KE_END; key++) |
984 | length++; | 984 | length++; |
985 | 985 | ||
986 | new_keymap = kmalloc(length * sizeof(struct key_entry), GFP_KERNEL); | 986 | new_keymap = kmemdup(keymap, length * sizeof(struct key_entry), |
987 | GFP_KERNEL); | ||
987 | if (!new_keymap) | 988 | if (!new_keymap) |
988 | return -ENOMEM; | 989 | return -ENOMEM; |
989 | 990 | ||
990 | memcpy(new_keymap, keymap, length * sizeof(struct key_entry)); | ||
991 | keymap = new_keymap; | 991 | keymap = new_keymap; |
992 | 992 | ||
993 | return 0; | 993 | return 0; |