Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp672004img; Fri, 22 Mar 2019 06:18:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqyzf3x/z4f+1p+AyUlYYEfLoB9CmWq1riC4UG/C02W1GQdkeJMmdFE8+whsnNM+MdATArOD X-Received: by 2002:a63:f146:: with SMTP id o6mr8747018pgk.360.1553260725538; Fri, 22 Mar 2019 06:18:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553260725; cv=none; d=google.com; s=arc-20160816; b=r9Mt1HKjUyCV46hVxjUg2RegCiTWT39+Q5xLZCaN0MZzrxFckole+2fIW0WuZ2qZeu sjQcL0LtmcgXEUpOUK2WIyk8gs8u2iFlHdfRXWfU2sbsf1v5pe3yd6EZWTZkjZ6RmS2n CiuyICYJJ7yDvBhDBoH/phCbas5/tFB9FC3umeaiuAcdkZKJAtgpCzZl5dqE/q5Z6nmS cKUfYQY3Ox/A6nfUwnDF2nmhlFGYurmHp4PMvWFqCEwMC3YW7KOagLWR79yFCPUvoxBE e1vgR1BiKqyTn2EERbJZLbJrWF7dAU1xY188oO7aBO7rQOLNCMfcu9gJ0LYw68ndeBSj rGEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Oqp9tuQx8gHquF9FELe/cRZMQtfpa9ovt9HE9jk4rNQ=; b=I/0kLC7M9JUsIwaGQYYAlXq9ig7/DzfWXq3MKXtJYbOMzfTTC8ioFjCUImhrqohkDi p+6BzzWTfFUClsnLePSOV8v+bpj7IvxbnzH2rZT1PuB+LarZemoDXxRBHErs8xKnOx6y Rwy/zfhklE4/ivF/4eeU3uF/7Wdj+2jQoTZwloNOEqBcDXHUiZEx1Xc0naU7JKPCYVM/ x3Iq44eSJzi9dnPwl3Uvt6OhGJFefGUKC+fzvjgzZ/OayWbo9mvcM8468M5Jb3ItVsx1 PRaDbawsk9Wys1/FNM8LFOeSaEs53Wwiwbw55r3UzyI1Tly0dLz4OD0U505P2nn2eT8e xG6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZBPRy5G2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w8si6486278pgs.302.2019.03.22.06.18.30; Fri, 22 Mar 2019 06:18:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZBPRy5G2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729311AbfCVLZh (ORCPT + 99 others); Fri, 22 Mar 2019 07:25:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:52990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728957AbfCVLZf (ORCPT ); Fri, 22 Mar 2019 07:25:35 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A73920657; Fri, 22 Mar 2019 11:25:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253934; bh=g7fHfEr47VrvvqCD6Vg3ex1s7wsyzlWSa/BB8+716P4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZBPRy5G2RJwDfic1bkzYx7mGFdiFMcQE+a47ALvQGJrIt5ZTmfu0bZSFJE4FkT7tX ooTOVSY2Ofcxm0umE8HGjvGGTkdzVfzeUHJ751m0HOS47TnoLRsQ51tuVMtEqXEu2f IyGxJb/2wG6EwTGIIVy93zUD82AzGdTd5jScXSa4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Torokhov , Sasha Levin Subject: [PATCH 3.18 099/134] Input: matrix_keypad - use flush_delayed_work() Date: Fri, 22 Mar 2019 12:15:12 +0100 Message-Id: <20190322111217.319495080@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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