Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp285835pxx; Wed, 28 Oct 2020 05:03:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXXkSWvIWc8bAqm8Ct5+EncXlwQJHTvt/L1cywYrXkMWdiHdFSXChAHFkMeRuiVT2LqGsD X-Received: by 2002:a50:9b14:: with SMTP id o20mr7033583edi.328.1603886593373; Wed, 28 Oct 2020 05:03:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603886593; cv=none; d=google.com; s=arc-20160816; b=ksuYX31gUPqb3rAy/5sUZcF9AhyhXUa2R8fj2WfeEdr/V4K5DYpk+ZSgF0gs6R3vj7 RfDInLbWyCAHw3/ofTAPrBvNSo9A7k0vY/es+YKSFoVfBfVOQGApdBgp3Wr2/0mi/Udu g+4Fi3TlZ7gE4OTe71cvkNUau24Cu1C04thVpkdLANDk97P/27dHB8KowJPDnmJlltBl 9JB3OdEdpC8QnTAOkozV/IwqRQw6/vZCBj2VDgmvXYZgpMmLf5qr5dEE7vOyGNxq+N6C b4/ofSqPVefsl6aBam1OgkW9nruRdTvwCHsfqwKd9V7zWx7yAZf36EJx1GShdiYNzEHI 5tJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mUt6jFLFRT7g6n3B4Cowaj8eiR6wEEmD9OpZtMDpJCI=; b=0NqzH98ZSRk3yf0b58EhX3+rgXqCdfwb678ZWhN5iSA574tFLwU0hNPdsfkDPEvVhB panL0HWaZP59HfVUDmaEGNYbn5/wN23tqvSAqMdtFw2CVuSKRK1b40JmwyOacVpW3HKn mEdu8XLWujq6DJ9IOLYJgmlMDx7SFrMSU10PVzQz1KREuFVCuXVV8cv2k0rt9xUzYXNI 0VqKeMpkjrc0Oco90zojo/wX8iXUUMrBGdnm7uh1YN7mFhgFyrb7t7BfNVlBrt6ojVlf kq6iM7K9znvOK1Cu61FdNC5BWnBSRiHQNAfJAzyrtDYHWRb5MBdxqpYH5ohOwGvxi3LI oYGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=neAkGDZ0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w17si2969573ejk.629.2020.10.28.05.02.49; Wed, 28 Oct 2020 05:03:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=neAkGDZ0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1795056AbgJ0PPA (ORCPT + 99 others); Tue, 27 Oct 2020 11:15:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:44974 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1793967AbgJ0PJb (ORCPT ); Tue, 27 Oct 2020 11:09:31 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 D87742072E; Tue, 27 Oct 2020 15:09:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603811369; bh=4GCvr38Q1X2tbphwJv0d7plkl0dZrQXGEdT44WQELVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=neAkGDZ0DM4ZoxNkLGl6FO9G1C4gqL3djFtSz14Jb+KsvERQWumC6BLUtgSj6Sopw WfYFtrU+kgl/0D9UCUVSo6D66+JMja4WsTMuYykBlp1yY6LZ5QLKEom9T4YqhuFvj2 Fem+gaFJ/aZlnAaLNSICxxrYV6XMmaJEYa06COB4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , Dmitry Torokhov , Sasha Levin Subject: [PATCH 5.8 468/633] Input: stmfts - fix a & vs && typo Date: Tue, 27 Oct 2020 14:53:31 +0100 Message-Id: <20201027135544.687191401@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: YueHaibing [ Upstream commit d04afe14b23651e7a8bc89727a759e982a8458e4 ] In stmfts_sysfs_hover_enable_write(), we should check value and sdata->hover_enabled is all true. Fixes: 78bcac7b2ae1 ("Input: add support for the STMicroelectronics FingerTip touchscreen") Signed-off-by: YueHaibing Link: https://lore.kernel.org/r/20200916141941.16684-1-yuehaibing@huawei.com Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/touchscreen/stmfts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c index b54cc64e4ea64..389356332c54a 100644 --- a/drivers/input/touchscreen/stmfts.c +++ b/drivers/input/touchscreen/stmfts.c @@ -479,7 +479,7 @@ static ssize_t stmfts_sysfs_hover_enable_write(struct device *dev, mutex_lock(&sdata->mutex); - if (value & sdata->hover_enabled) + if (value && sdata->hover_enabled) goto out; if (sdata->running) -- 2.25.1