aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-01-07 12:55:14 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-01-07 12:57:21 -0500
commit7ae6cfe8d24681bea5a4a4b7a04915ac08c09ba5 (patch)
treead15961e83d6e1e4e10effe52aa3d005a5f72262
parent415a249f88fd263bed0f7cca86ecde8c57aba9dc (diff)
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>
-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)
292 setup_timer(&omap_kp->timer, omap_kp_timer, (unsigned long)omap_kp); 292 setup_timer(&omap_kp->timer, omap_kp_timer, (unsigned long)omap_kp);
293 293
294 /* get the irq and init timer*/ 294 /* get the irq and init timer*/
295 tasklet_enable(&kp_tasklet);
296 kp_tasklet.data = (unsigned long) omap_kp; 295 kp_tasklet.data = (unsigned long) omap_kp;
296 tasklet_enable(&kp_tasklet);
297 297
298 ret = device_create_file(&pdev->dev, &dev_attr_enable); 298 ret = device_create_file(&pdev->dev, &dev_attr_enable);
299 if (ret < 0) 299 if (ret < 0)