On Sun, Jun 12, 2016 at 03:28:56PM +0100, Sudip Mukherjee wrote:
> If devm_add_action() fails we are printing the error message and
> returning but we have already setup a delayed work or a timer.
> Lets now use the helper devm_add_action_or_reset() and return and in
> case of error the cleanup function will be called by the helper to
> cancel the delayed work or to delete the timer.
We do not fire up timer/work unless IRQ triggers and we register it
afterwards so there is no need to quiesce the key if adding devm ction
fails.
Thanks.
>
> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@xxxxxxxxxxxxxxx>
> ---
> drivers/input/keyboard/gpio_keys.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
> index 2909365..2b1d2e9 100644
> --- a/drivers/input/keyboard/gpio_keys.c
> +++ b/drivers/input/keyboard/gpio_keys.c
> @@ -542,7 +542,8 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
> * Install custom action to cancel release timer and
> * workqueue item.
> */
> - error = devm_add_action(&pdev->dev, gpio_keys_quiesce_key, bdata);
> + error = devm_add_action_or_reset(&pdev->dev,
> + gpio_keys_quiesce_key, bdata);
> if (error) {
> dev_err(&pdev->dev,
> "failed to register quiesce action, error: %d\n",
> --
> 1.9.1
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
