diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
| commit | 5e2aa2ed08e2e280121dc7cf5609c87d464f12ef (patch) | |
| tree | ca7d7b1480285e3b617fecc5b41f0ce150a82c32 /drivers/input/misc/soc_button_array.c | |
| parent | f62d14a8072b9756db36ba394e2b267470a40240 (diff) | |
| parent | fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.17.
Diffstat (limited to 'drivers/input/misc/soc_button_array.c')
| -rw-r--r-- | drivers/input/misc/soc_button_array.c | 3 |
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, | |||
| 83 | sizeof(*gpio_keys_pdata) + | 83 | sizeof(*gpio_keys_pdata) + |
| 84 | sizeof(*gpio_keys) * MAX_NBUTTONS, | 84 | sizeof(*gpio_keys) * MAX_NBUTTONS, |
| 85 | GFP_KERNEL); | 85 | GFP_KERNEL); |
| 86 | if (!gpio_keys_pdata) | ||
| 87 | return ERR_PTR(-ENOMEM); | ||
| 88 | |||
| 86 | gpio_keys = (void *)(gpio_keys_pdata + 1); | 89 | gpio_keys = (void *)(gpio_keys_pdata + 1); |
| 87 | 90 | ||
| 88 | for (info = button_info; info->name; info++) { | 91 | for (info = button_info; info->name; info++) { |