diff mbox

Input: omap-keypad: fix memory leak

Message ID 1442575480-336-1-git-send-email-sudipm.mukherjee@gmail.com (mailing list archive)
State Accepted
Headers show

Commit Message

Sudip Mukherjee Sept. 18, 2015, 11:24 a.m. UTC 
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(-)

Comments

Dmitry Torokhov Sept. 28, 2015, 11:04 p.m. UTC | #1 
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
>
diff mbox

Patch

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) {