summaryrefslogtreecommitdiff
path: root/drivers/input/sparse-keymap.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2025-06-01 21:41:07 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2025-06-01 21:41:07 -0700
commit4f9786035f9e519db41375818e1d0b5f20da2f10 (patch)
treeb307ecc9ab55c44ace462e59549c6d7976da5bfd /drivers/input/sparse-keymap.c
parentca39500f6af9cfe6823dc5aa8fbaed788d6e35b2 (diff)
parenta95ef0199e80f3384eb992889322957d26c00102 (diff)
Merge branch 'next' into for-linus
Prepare input updates for 6.16 merge window.
Diffstat (limited to 'drivers/input/sparse-keymap.c')
-rw-r--r--drivers/input/sparse-keymap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/sparse-keymap.c b/drivers/input/sparse-keymap.c
index 25bf8be6e711..96f23ae57d5a 100644
--- a/drivers/input/sparse-keymap.c
+++ b/drivers/input/sparse-keymap.c
@@ -176,8 +176,7 @@ int sparse_keymap_setup(struct input_dev *dev,
for (e = keymap; e->type != KE_END; e++)
map_size++;
- map = devm_kmemdup(&dev->dev, keymap, map_size * sizeof(*map),
- GFP_KERNEL);
+ map = devm_kmemdup_array(&dev->dev, keymap, map_size, sizeof(*keymap), GFP_KERNEL);
if (!map)
return -ENOMEM;