Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758027AbaGYHGE (ORCPT ); Fri, 25 Jul 2014 03:06:04 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:44572 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750828AbaGYHGC (ORCPT ); Fri, 25 Jul 2014 03:06:02 -0400 From: pramod.gurav.etc@gmail.com X-Google-Original-From: pramod.gurav@smartplayin.com To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Pramod Gurav , Dmitry Torokhov , Lejun Zhu , Sachin Kamat Subject: [PATCH] Input: soc_button_array: Remove kfree on data allocated with devm_zalloc Date: Fri, 25 Jul 2014 12:39:40 +0530 Message-Id: <1406272180-25101-1-git-send-email-pramod.gurav@smartplayin.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pramod Gurav 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 CC: Lejun Zhu CC: Sachin Kamat Signed-off-by: Pramod Gurav --- 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"); + error = -ENOMEM; + goto err_mem; + } + 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; } 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; } 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: 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"); return -ENOMEM; + } pnp_set_drvdata(pdev, priv); -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/