On Sun, Jun 12, 2016 at 03:34:21PM +0100, Sudip Mukherjee wrote: > 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. >
We set up timer, that is correct, however the timer will not run so there is no need to stop it. Thanks. > Signed-off-by: Sudip Mukherjee <[email protected]> > --- > 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 > -- Dmitry
