From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 747B8C43381 for ; Mon, 11 Mar 2019 20:00:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FCB92064A for ; Mon, 11 Mar 2019 20:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552334442; bh=FR0ygwC8oLPsGGLulMP/0I1ZXWAQjxy65/lqdL22wio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K2vN83AiFRDXtm6A0CLonWwuatnoghXjBLvOIgVLtuyDXKA4hqCrHYKn2E55iFOu1 cH3vr+a2qawCt9zh6fSvTdgbUUt+YzSQmtvCxuxfeNBeR4dUAQpsz4BDcMpVvDcx/i gWvA3R0dlLNNlt8i7Y4AQehygltpPVv/YzZy4xW0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729336AbfCKUAk (ORCPT ); Mon, 11 Mar 2019 16:00:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:37266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729698AbfCKT74 (ORCPT ); Mon, 11 Mar 2019 15:59:56 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 33CD62064A; Mon, 11 Mar 2019 19:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552334395; bh=FR0ygwC8oLPsGGLulMP/0I1ZXWAQjxy65/lqdL22wio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KJ44ik9Kyr8FcTHJmHiK3Igc5whCxTO3boDXheKXT2eD7v91A+uLM+3BWOvcOYywA QwCvlHpoRqBiTIQETQlTFKoZY1uoGSQlpC8nAYUSo3hmBN9xlj2atCJuJFZLVCoNX+ vMTaa6W/GzoaNGenTr4bRG0Is6boIvzgE8rWbkbw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Torokhov , Sasha Levin , linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 3.18 2/6] Input: matrix_keypad - use flush_delayed_work() Date: Mon, 11 Mar 2019 15:59:47 -0400 Message-Id: <20190311195951.139741-2-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190311195951.139741-1-sashal@kernel.org> References: <20190311195951.139741-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Torokhov [ Upstream commit a342083abe576db43594a32d458a61fa81f7cb32 ] We should be using flush_delayed_work() instead of flush_work() in matrix_keypad_stop() to ensure that we are not missing work that is scheduled but not yet put in the workqueue (i.e. its delay timer has not expired yet). Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/keyboard/matrix_keypad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c index 176bdd140769..a1b9753e0616 100644 --- a/drivers/input/keyboard/matrix_keypad.c +++ b/drivers/input/keyboard/matrix_keypad.c @@ -220,7 +220,7 @@ static void matrix_keypad_stop(struct input_dev *dev) keypad->stopped = true; spin_unlock_irq(&keypad->lock); - flush_work(&keypad->work.work); + flush_delayed_work(&keypad->work); /* * matrix_keypad_scan() will leave IRQs enabled; * we should disable them now. -- 2.19.1