summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorPramod Gurav <pramod.gurav@smartplayin.com>2014-07-26 05:41:39 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-07-26 05:58:41 +0400
commit91cf07cdaedbc29d03f572a1b0e5cf41ee6febab (patch)
treea98b21d2d28687fc9cc7bcee593063646eeb5133 /drivers/input
parent5e740ce6043da476f1ee61c18af7d1df40ecbb57 (diff)
downloadlinux-91cf07cdaedbc29d03f572a1b0e5cf41ee6febab.tar.xz
Input: soc_button_array - add missing memory allocation check
Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/soc_button_array.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index 5a6334be30b8..e34dfc29beb3 100644
--- 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++) {