From: pramod.gurav.etc@gmail.com
To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Pramod Gurav <pramod.gurav@smartplayin.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Lejun Zhu <lejun.zhu@linux.intel.com>,
Sachin Kamat <sachin.kamat@linaro.org>
Subject: [PATCH] Input: soc_button_array: Remove kfree on data allocated with devm_zalloc
Date: Fri, 25 Jul 2014 12:39:40 +0530 [thread overview]
Message-ID: <1406272180-25101-1-git-send-email-pramod.gurav@smartplayin.com> (raw)
From: Pramod Gurav <pramod.gurav@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
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 <lejun.zhu@linux.intel.com>
CC: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com>
---
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
next reply other threads:[~2014-07-25 7:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-25 7:09 pramod.gurav.etc [this message]
2014-07-25 8:29 ` [PATCH] Input: soc_button_array: Remove kfree on data allocated with devm_zalloc Sachin Kamat
2014-07-25 8:48 ` pramod gurav
2014-07-25 9:02 ` David Rientjes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406272180-25101-1-git-send-email-pramod.gurav@smartplayin.com \
--to=pramod.gurav.etc@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=lejun.zhu@linux.intel.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pramod.gurav@smartplayin.com \
--cc=sachin.kamat@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.