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=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 ABC04C4727F for ; Mon, 5 Oct 2020 15:35:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 70763206DD for ; Mon, 5 Oct 2020 15:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601912157; bh=loSTzaIyy/eWX7bIjRiRN78CodfkLCAmYrOJDPV4Vro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mZlw0k7qd6hwuqU4xddQPlRo5SpHGPNOtwr6w91qQUVQApMK01HBfwme1FFZz0W/0 bBRwvuBwmL7JRpn71iYTlLJk2lAcuhxIV6fq3aDQl/97t1AqXTM5SeS6x2B2iK1qqL isBjRQPpaqxCPROE7/DwPDQivoAFj0P7qqsKOkR8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728411AbgJEPf4 (ORCPT ); Mon, 5 Oct 2020 11:35:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:33830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728177AbgJEPdk (ORCPT ); Mon, 5 Oct 2020 11:33:40 -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 9B178206DD; Mon, 5 Oct 2020 15:33:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601912020; bh=loSTzaIyy/eWX7bIjRiRN78CodfkLCAmYrOJDPV4Vro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b9MbDHyHcg1laRcz+5aqbLDfFv9M2qNapyWePlQj80VMKjNM6sLgD9d26fJF8riGT Ir1UEhaKHBg2r6NaFAe2u0omVJM6gI1OwCAB2+MgpPbt6eqbvhEFHsefKIZst4deuQ OrL1OBLHDPNGDCakICJqsR9En40G8DayuvFbsZuA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vincent Huang , Harry Cutts , Dmitry Torokhov , Sasha Levin Subject: [PATCH 5.8 68/85] Input: trackpoint - enable Synaptics trackpoints Date: Mon, 5 Oct 2020 17:27:04 +0200 Message-Id: <20201005142118.003428623@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005142114.732094228@linuxfoundation.org> References: <20201005142114.732094228@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: Vincent Huang [ Upstream commit 996d585b079ad494a30cac10e08585bcd5345125 ] Add Synaptics IDs in trackpoint_start_protocol() to mark them as valid. Signed-off-by: Vincent Huang Fixes: 6c77545af100 ("Input: trackpoint - add new trackpoint variant IDs") Reviewed-by: Harry Cutts Tested-by: Harry Cutts Link: https://lore.kernel.org/r/20200924053013.1056953-1-vincent.huang@tw.synaptics.com Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/mouse/trackpoint.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index 854d5e7587241..ef2fa0905208d 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c @@ -282,6 +282,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, case TP_VARIANT_ALPS: case TP_VARIANT_ELAN: case TP_VARIANT_NXP: + case TP_VARIANT_JYT_SYNAPTICS: + case TP_VARIANT_SYNAPTICS: if (variant_id) *variant_id = param[0]; if (firmware_id) -- 2.25.1