Input: adp5588-keys - cancel workqueue in failure path
authorPramod Gurav <pramod.gurav@smartplayin.com>
Tue, 7 Oct 2014 16:33:16 +0000 (09:33 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 7 Oct 2014 16:55:01 +0000 (09:55 -0700)
In case we start with the device not fully quiesced we should make sure we
cancel the workqueue after freeing interrupt.

Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/adp5588-keys.c

index 5ef7fcf0e2509b8196cf69a993247febae4c20b7..728133ec6d7b93eb9a86c7fb7207782ae287bc5e 100644 (file)
@@ -589,6 +589,7 @@ static int adp5588_probe(struct i2c_client *client,
 
  err_free_irq:
        free_irq(client->irq, kpad);
+       cancel_delayed_work_sync(&kpad->work);
  err_unreg_dev:
        input_unregister_device(input);
        input = NULL;