X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Finput%2Fmisc%2Fsoc_button_array.c;h=e34dfc29beb3bb920d9548c2bd4a057d10297179;hb=7453f33b2e07fc2835e24cda0893de83c78d8d76;hp=5a6334be30b8dbdbfc2c7405ca5337e35891091b;hpb=7216a4183947853f359b41ba1edb5db9b3091acc;p=firefly-linux-kernel-4.4.55.git

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++) {