linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Input: omap-keypad: fix memory leak
@ 2015-09-18 11:24 Sudip Mukherjee
  2015-09-28 23:04 ` Dmitry Torokhov
  0 siblings, 1 reply; 2+ messages in thread
From: Sudip Mukherjee @ 2015-09-18 11:24 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: linux-kernel, linux-input, Sudip Mukherjee

If omap4_keypad_parse_dt() fails we returned the error code but we
missed releasing keypad_data.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/input/keyboard/omap4-keypad.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index b052afe..6639b2b 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -266,7 +266,7 @@ static int omap4_keypad_probe(struct platform_device *pdev)
 
 	error = omap4_keypad_parse_dt(&pdev->dev, keypad_data);
 	if (error)
-		return error;
+		goto err_free_keypad;
 
 	res = request_mem_region(res->start, resource_size(res), pdev->name);
 	if (!res) {
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Input: omap-keypad: fix memory leak
  2015-09-18 11:24 [PATCH] Input: omap-keypad: fix memory leak Sudip Mukherjee
@ 2015-09-28 23:04 ` Dmitry Torokhov
  0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2015-09-28 23:04 UTC (permalink / raw)
  To: Sudip Mukherjee; +Cc: linux-kernel, linux-input

On Fri, Sep 18, 2015 at 04:54:40PM +0530, Sudip Mukherjee wrote:
> If omap4_keypad_parse_dt() fails we returned the error code but we
> missed releasing keypad_data.
> 
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>

Applied, thank you.

> ---
>  drivers/input/keyboard/omap4-keypad.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
> index b052afe..6639b2b 100644
> --- a/drivers/input/keyboard/omap4-keypad.c
> +++ b/drivers/input/keyboard/omap4-keypad.c
> @@ -266,7 +266,7 @@ static int omap4_keypad_probe(struct platform_device *pdev)
>  
>  	error = omap4_keypad_parse_dt(&pdev->dev, keypad_data);
>  	if (error)
> -		return error;
> +		goto err_free_keypad;
>  
>  	res = request_mem_region(res->start, resource_size(res), pdev->name);
>  	if (!res) {
> -- 
> 1.9.1
> 

-- 
Dmitry

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-09-28 23:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-18 11:24 [PATCH] Input: omap-keypad: fix memory leak Sudip Mukherjee
2015-09-28 23:04 ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).