From patchwork Wed Oct 31 08:05:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaotian Feng X-Patchwork-Id: 1676471 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A90CFDF2F6 for ; Wed, 31 Oct 2012 08:05:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933720Ab2JaIF3 (ORCPT ); Wed, 31 Oct 2012 04:05:29 -0400 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 Received: by mail-pa0-f46.google.com with SMTP id hz1so785844pad.19 for ; Wed, 31 Oct 2012 01:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=EMymYGy3ezhSnhN2F81nJI/39FotlR/kZ0lK2+75ckk=; b=DvCRJRICsIKEjbj2s96d7xZj4kSIzHLbwspAV/jv6Iz8d85emoVAbGJKD6hCscTFJt ROP3KGLgpznXT+mLIvGcA1ChUv6OUr5OybzxHgKCyvY66lvwxlCnLdODiQ3oZJkF5a+s ZzS+VbKlfSOqhzHzvJAjB+qN0DlUIyPlLNzlALD9LvMVuaVI7j3IN3op4jp3eND3F1i+ gXeOTuSo13rFe7VOFr+KiW0Bo+YMvRQ0NJFNW6Kw24GD7u8khWzcamaUYCXFtjfFWrXU 2wk3kDJ8pzde4RqkUV0s9888YhH8e2eZZpoL4Cajr/BJfEOoOZAtpVpZBGZUuiUPY1bw Dncg== Received: by 10.66.89.138 with SMTP id bo10mr100162696pab.0.1351670724468; Wed, 31 Oct 2012 01:05:24 -0700 (PDT) Received: from localhost.localdomain ([61.135.172.68]) by mx.google.com with ESMTPS id ju7sm1918850pbb.60.2012.10.31.01.05.18 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 01:05:23 -0700 (PDT) From: Xiaotian Feng To: linux-kernel@vger.kernel.org Cc: Xiaotian Feng , Xiaotian Feng , Tony Lindgren , Sourav Poddar , Josh , Greg Kroah-Hartman , linux-input@vger.kernel.org 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> X-Mailer: git-send-email 1.7.9.5 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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); }