Commit 0e3d0f3d authored by Jesper Juhl's avatar Jesper Juhl Committed by Dmitry Torokhov

Input: da9052 - fix memory leak in da9052_onkey_probe()

If, in drivers/input/misc/da9052_onkey.c::da9052_onkey_probe(), the
call to either kzalloc() or input_allocate_device() fails then we will
return -ENOMEM from the function without freeing the other allocation
that may have succeeded, thus we leak either the memory allocated for
'onkey' or the memory allocated for 'input_dev' if one succeeds and
the other fails.
Fix that by jumping to the 'err_free_mem' label at the end of the
function that properly cleans up rather than returning directly.
Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 55158c88
...@@ -95,7 +95,8 @@ static int __devinit da9052_onkey_probe(struct platform_device *pdev) ...@@ -95,7 +95,8 @@ static int __devinit da9052_onkey_probe(struct platform_device *pdev)
input_dev = input_allocate_device(); input_dev = input_allocate_device();
if (!onkey || !input_dev) { if (!onkey || !input_dev) {
dev_err(&pdev->dev, "Failed to allocate memory\n"); dev_err(&pdev->dev, "Failed to allocate memory\n");
return -ENOMEM; error = -ENOMEM;
goto err_free_mem;
} }
onkey->input = input_dev; onkey->input = input_dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment