Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / input / serio / hil_mlc.c

diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index bfd3865d886bf42752a8bf617fa592ed78ddf775..65605e4ef3cf6f7b085816ffeb8b2c11af0f4fc4 100644 (file)
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -686,13 +686,12 @@ static int hilse_donode(hil_mlc *mlc)
                write_lock_irqsave(&mlc->lock, flags);
                pack = node->object.packet;
        out:
-               if (mlc->istarted)
-                       goto out2;
-               /* Prepare to receive input */
-               if ((node + 1)->act & HILSE_IN)
-                       hilse_setup_input(mlc, node + 1);
+               if (!mlc->istarted) {
+                       /* Prepare to receive input */
+                       if ((node + 1)->act & HILSE_IN)
+                               hilse_setup_input(mlc, node + 1);
+               }
 
-       out2:
                write_unlock_irqrestore(&mlc->lock, flags);
 
                if (down_trylock(&mlc->osem)) {
@@ -1010,8 +1009,6 @@ static int __init hil_mlc_init(void)
 static void __exit hil_mlc_exit(void)
 {
        del_timer_sync(&hil_mlcs_kicker);
-
-       tasklet_disable(&hil_mlcs_tasklet);
        tasklet_kill(&hil_mlcs_tasklet);
 }