lkml.org 
[lkml]   [2015]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 111/123] Input: omap4-keypad - fix memory leak
    Date
    From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit d79bdc7f004404204a6ac07785f8d6717070ecdb upstream.

    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>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Cc: Oliver Neukum <ONeukum@suse.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    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 30acfd49fa6c..1ba3490b9ffe 100644
    --- a/drivers/input/keyboard/omap4-keypad.c
    +++ b/drivers/input/keyboard/omap4-keypad.c
    @@ -284,7 +284,7 @@ static int omap4_keypad_probe(struct platform_device *pdev)
    } else {
    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);
    --
    2.6.2


    \
     
     \ /
      Last update: 2015-10-28 15:21    [W:3.382 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site