summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-01-07 18:55:14 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-01-07 18:57:21 +0100
commit7ae6cfe8d24681bea5a4a4b7a04915ac08c09ba5 (patch)
treead15961e83d6e1e4e10effe52aa3d005a5f72262 /drivers/input
parentInput: rohm_bu21023 - fix handling of retrying firmware update (diff)
downloadlinux-7ae6cfe8d24681bea5a4a4b7a04915ac08c09ba5.tar.xz
linux-7ae6cfe8d24681bea5a4a4b7a04915ac08c09ba5.zip
Input: omap-keypad - set tasklet data earlier
It feels like we should set the tasklet data before enabling it. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/omap-keypad.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 7502e46165fa..75ad6661e130 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -292,8 +292,8 @@ static int omap_kp_probe(struct platform_device *pdev)
setup_timer(&omap_kp->timer, omap_kp_timer, (unsigned long)omap_kp);
/* get the irq and init timer*/
- tasklet_enable(&kp_tasklet);
kp_tasklet.data = (unsigned long) omap_kp;
+ tasklet_enable(&kp_tasklet);
ret = device_create_file(&pdev->dev, &dev_attr_enable);
if (ret < 0)