From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiaotian Feng Subject: [PATCH 1/3] input: do not use tasklet_disable before tasklet_kill Date: Wed, 31 Oct 2012 16:05:59 +0800 Message-ID: <1351670761-26749-1-git-send-email-xtfeng@gmail.com> Return-path: Received: from mail-pa0-f46.google.com ([209.85.220.46]:52205 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934972Ab2JaIFZ (ORCPT ); Wed, 31 Oct 2012 04:05:25 -0400 Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: Xiaotian Feng , Xiaotian Feng , Tony Lindgren , Sourav Poddar , Josh , Greg Kroah-Hartman , linux-input@vger.kernel.org If tasklet_disable() is called before related tasklet handled, tasklet_kill will never be finished. tasklet_kill is enough. Signed-off-by: Xiaotian Feng Cc: Dmitry Torokhov Cc: Tony Lindgren Cc: Sourav Poddar Cc: Josh Cc: Greg Kroah-Hartman Cc: linux-input@vger.kernel.org --- drivers/input/keyboard/omap-keypad.c | 3 +-- drivers/input/serio/hil_mlc.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 4a5fcc8..6c52447 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c @@ -362,12 +362,11 @@ static int __devexit omap_kp_remove(struct platform_device *pdev) struct omap_kp *omap_kp = platform_get_drvdata(pdev); /* disable keypad interrupt handling */ - tasklet_disable(&kp_tasklet); + tasklet_kill(&kp_tasklet); omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); free_irq(omap_kp->irq, omap_kp); del_timer_sync(&omap_kp->timer); - tasklet_kill(&kp_tasklet); /* unregister everything */ input_unregister_device(omap_kp->input); diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index bfd3865..7fc1700 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c @@ -1011,7 +1011,6 @@ static void __exit hil_mlc_exit(void) { del_timer_sync(&hil_mlcs_kicker); - tasklet_disable(&hil_mlcs_tasklet); tasklet_kill(&hil_mlcs_tasklet); } -- 1.7.9.5