Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751740AbaG1Guo (ORCPT ); Mon, 28 Jul 2014 02:50:44 -0400 Received: from mail-la0-f46.google.com ([209.85.215.46]:57659 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750948AbaG1Gum (ORCPT ); Mon, 28 Jul 2014 02:50:42 -0400 MIME-Version: 1.0 In-Reply-To: <20140725162258.GA12254@core.coreip.homeip.net> References: <1406288074-28725-1-git-send-email-pramod.gurav@smartplayin.com> <20140725162258.GA12254@core.coreip.homeip.net> Date: Mon, 28 Jul 2014 12:20:41 +0530 Message-ID: Subject: Re: [PATCH v2] Input: soc_button_array: Remove kfree on data allocated with devm_zalloc From: pramod gurav To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, "linux-kernel@vger.kernel.org" , Pramod Gurav , Lejun Zhu , Sachin Kamat Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Dmitry, Thanks for the review. On Fri, Jul 25, 2014 at 9:52 PM, Dmitry Torokhov wrote: > Hi Pramod, > > On Fri, Jul 25, 2014 at 05:04:34PM +0530, pramod.gurav.etc@gmail.com wrote: >> 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 >> >> CC: Dmitry Torokhov >> CC: Lejun Zhu >> CC: Sachin Kamat >> >> Signed-off-by: Pramod Gurav >> --- >> drivers/input/misc/soc_button_array.c | 17 +++++++---------- >> 1 file changed, 7 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c >> index 5a6334b..fc64ec6 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); > > OK, that makes sense. > >> + >> gpio_keys = (void *)(gpio_keys_pdata + 1); >> >> for (info = button_info; info->name; info++) { >> @@ -102,20 +105,16 @@ soc_button_device_create(struct pnp_dev *pdev, >> n_buttons++; >> } >> >> - if (n_buttons == 0) { >> - error = -ENODEV; >> - goto err_free_mem; >> - } >> + if (n_buttons == 0) >> + return ERR_PTR(-ENODEV); > > But that one and the rest don't, because failure in > soc_button_device_create() does not necessarily mean that binding for > the whole device will fail. In this case we do not want unused memory > hang around. Agree. Should resend the patch with only the error check after mem allocation and will be little more careful while sending any such change. :) > > Thanks. > > -- > Dmitry -- Thanks and Regards Pramod -- 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/