Hi Pramod,
On Fri, Jul 25, 2014 at 2:42 PM, <pramod.gurav....@gmail.com> wrote:
> From: Pramod Gurav <pramod.gu...@smartplayin.com>
>
> 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
> - Removes the error lables and instead releases resources and returns
> after failures
>
> CC: Dmitry Torokhov <dmitry.torok...@gmail.com>
> CC: Lejun Zhu <lejun....@linux.intel.com>
> CC: Sachin Kamat <sachin.ka...@linaro.org>
>
> Signed-off-by: Pramod Gurav <pramod.gu...@smartplayin.com>
> ---
>
> Changes since v1:
> - Removes de_err logs on OOM cases which is not needed.
>
> drivers/input/misc/soc_button_array.c | 27 +++++++++++++++------------
> 1 file changed, 15 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/input/misc/soc_button_array.c
> b/drivers/input/misc/soc_button_array.c
> index 5a6334b..f421cf4 100644
> --- a/drivers/input/misc/soc_button_array.c
> +++ b/drivers/input/misc/soc_button_array.c
> @@ -83,6 +83,11 @@ soc_button_device_create(struct pnp_dev *pdev,
> sizeof(*gpio_keys_pdata) +
> sizeof(*gpio_keys) * MAX_NBUTTONS,
> GFP_KERNEL);
> + if (!gpio_keys_pdata) {
> + error = -ENOMEM;
> + return ERR_PTR(error);
You don't need a variable here. You could directly do:
return ERR_PTR(-ENOMEM);
> + }
> +
> gpio_keys = (void *)(gpio_keys_pdata + 1);
>
> for (info = button_info; info->name; info++) {
> @@ -104,7 +109,7 @@ soc_button_device_create(struct pnp_dev *pdev,
>
> if (n_buttons == 0) {
> error = -ENODEV;
> - goto err_free_mem;
> + return ERR_PTR(error);
ditto
> }
>
> gpio_keys_pdata->buttons = gpio_keys;
> @@ -114,25 +119,23 @@ 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;
> + return ERR_PTR(error);
ditto
> }
>
> error = platform_device_add_data(pd, gpio_keys_pdata,
> sizeof(*gpio_keys_pdata));
> - if (error)
> - goto err_free_pdev;
This goto could be retained to avoid code duplication.
> + if (error) {
> + platform_device_put(pd);
> + return ERR_PTR(error);
> + }
>
> error = platform_device_add(pd);
> - if (error)
> - goto err_free_pdev;
ditto
> + if (error) {
> + platform_device_put(pd);
> + return ERR_PTR(error);
> + }
>
> return pd;
> -
> -err_free_pdev:
> - platform_device_put(pd);
> -err_free_mem:
> - devm_kfree(&pdev->dev, gpio_keys_pdata);
> - return ERR_PTR(error);
> }
>
> static void soc_button_remove(struct pnp_dev *pdev)
> --
> 1.7.9.5
>
--
Regards,
Sachin.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
