Messages in this thread Patch in this message | | | From | Sudip Mukherjee <> | Subject | [PATCH] Input: snvs_pwrkey - use devm_add_action_or_reset | Date | Sun, 12 Jun 2016 15:34:21 +0100 |
| |
If devm_add_action() fails we are printing the error message and returning but we have already setup a timer. Lets now use the helper devm_add_action_or_reset() and return and so in case of error the cleanup function will be called by the helper to delete the timer.
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> --- drivers/input/keyboard/snvs_pwrkey.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c index 24a9f59..c301419 100644 --- a/drivers/input/keyboard/snvs_pwrkey.c +++ b/drivers/input/keyboard/snvs_pwrkey.c @@ -150,7 +150,8 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev) input_set_capability(input, EV_KEY, pdata->keycode); /* input customer action to cancel release timer */ - error = devm_add_action(&pdev->dev, imx_snvs_pwrkey_act, pdata); + error = devm_add_action_or_reset(&pdev->dev, + imx_snvs_pwrkey_act, pdata); if (error) { dev_err(&pdev->dev, "failed to register remove action\n"); return error; -- 1.9.1
| |