Thanks Sachin for the review. Will resend the patch addressing your
review comments.

On Fri, Jul 25, 2014 at 1:59 PM, Sachin Kamat [off-list ref] wrote:

On Fri, Jul 25, 2014 at 12:39 PM,  [off-list ref] wrote:

quoted

From: Pramod Gurav <redacted>

This patch does below:
- Removes kfree done on data allocated with devm_zalloc in probe
  path of the driver.
- Adds a check on return value from devm_kzalloc which was missing
  and renames a lable from err_free_mem to err_mem.
- Adds couple of dev_err on failure to allocate memory

CC: Dmitry Torokhov <dmitry.torokhov@gmail.com>
CC: Lejun Zhu <redacted>
CC: Sachin Kamat <redacted>

Signed-off-by: Pramod Gurav <redacted>
---
 drivers/input/misc/soc_button_array.c |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index 5a6334b..ac82971 100644
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c

@@ -83,6 +83,13 @@ soc_button_device_create(struct pnp_dev *pdev,
                                       sizeof(*gpio_keys_pdata) +
                                        sizeof(*gpio_keys) * MAX_NBUTTONS,
                                       GFP_KERNEL);
+       if (!gpio_keys_pdata) {
+               dev_err(&pdev->dev,
+                       "Can't allocate memory for gpio_keys_platform_data\n");

OOM message is not needed as memory subsystem will take care of it.

quoted

+               error = -ENOMEM;
+               goto err_mem;

Return directly from here.

quoted

+       }
+
        gpio_keys = (void *)(gpio_keys_pdata + 1);

        for (info = button_info; info->name; info++) {

@@ -104,7 +111,7 @@ soc_button_device_create(struct pnp_dev *pdev,

        if (n_buttons == 0) {
                error = -ENODEV;
-               goto err_free_mem;
+               goto err_mem;

ditto

quoted

        }

        gpio_keys_pdata->buttons = gpio_keys;

@@ -114,7 +121,7 @@ soc_button_device_create(struct pnp_dev *pdev,
        pd = platform_device_alloc("gpio-keys", PLATFORM_DEVID_AUTO);
        if (!pd) {
                error = -ENOMEM;
-               goto err_free_mem;
+               goto err_mem;

ditto

quoted

        }

        error = platform_device_add_data(pd, gpio_keys_pdata,

@@ -130,8 +137,7 @@ soc_button_device_create(struct pnp_dev *pdev,

 err_free_pdev:
        platform_device_put(pd);
-err_free_mem:
-       devm_kfree(&pdev->dev, gpio_keys_pdata);
+err_mem:

This label would not be required once returned directly from above.

quoted

        return ERR_PTR(error);
 }

@@ -155,8 +161,11 @@ static int soc_button_pnp_probe(struct pnp_dev *pdev,
        int error;

        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-       if (!priv)
+       if (!priv) {
+               dev_err(&pdev->dev,
+                       "Can't allocate memory for soc_button_data\n");

OOM message is not needed as memory subsystem will take care of it.


--
Regards,
Sachin.

-- 
Thanks and Regards
Pramod