diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 14:20:58 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-01 14:20:58 -0700 |
| commit | dde3ada3d0069855eeb353707b2b0f946191cfd6 (patch) | |
| tree | bdc2d358f8dc7fc29000149ebc4db949934b15b2 /drivers/input/sparse-keymap.c | |
| parent | 5e056ef4ddeb6129f6bb170f2c26b8f370bbcda7 (diff) | |
| parent | fb4f552e895cec29934d94a99cbd1f1f00448a88 (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.7 merge window.
Diffstat (limited to 'drivers/input/sparse-keymap.c')
| -rw-r--r-- | drivers/input/sparse-keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/sparse-keymap.c b/drivers/input/sparse-keymap.c index 75fb040a343..a70aa555bbf 100644 --- a/drivers/input/sparse-keymap.c +++ b/drivers/input/sparse-keymap.c @@ -180,11 +180,11 @@ int sparse_keymap_setup(struct input_dev *dev, for (e = keymap; e->type != KE_END; e++) map_size++; - map = kcalloc(map_size, sizeof (struct key_entry), GFP_KERNEL); + map = kcalloc(map_size, sizeof(struct key_entry), GFP_KERNEL); if (!map) return -ENOMEM; - memcpy(map, keymap, map_size * sizeof (struct key_entry)); + memcpy(map, keymap, map_size * sizeof(struct key_entry)); for (i = 0; i < map_size; i++) { entry = &map[i]; |