projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-xsave-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
misc
/
soc_button_array.c
diff --git
a/drivers/input/misc/soc_button_array.c
b/drivers/input/misc/soc_button_array.c
index 5a6334be30b8dbdbfc2c7405ca5337e35891091b..e34dfc29beb3bb920d9548c2bd4a057d10297179 100644
(file)
--- a/
drivers/input/misc/soc_button_array.c
+++ b/
drivers/input/misc/soc_button_array.c
@@
-83,6
+83,9
@@
soc_button_device_create(struct pnp_dev *pdev,
sizeof(*gpio_keys_pdata) +
sizeof(*gpio_keys) * MAX_NBUTTONS,
GFP_KERNEL);
+ if (!gpio_keys_pdata)
+ return ERR_PTR(-ENOMEM);
+
gpio_keys = (void *)(gpio_keys_pdata + 1);
for (info = button_info; info->name; info++) {