Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / drivers / input / keyboard / adp5588-keys.c

diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index b97ed443e0a49bd02288f8d74cdcb669af730f17..21a62d0fa764806323927d8cfd1366b1c53bf259 100644 (file)
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -587,6 +587,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;