From patchwork Mon Oct 5 15:26:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 290656 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 EB220C4363D for ; Mon, 5 Oct 2020 15:30:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A9A182085B for ; Mon, 5 Oct 2020 15:30:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911826; bh=loSTzaIyy/eWX7bIjRiRN78CodfkLCAmYrOJDPV4Vro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kvLBw5a2RnRUzEYmW3ktd80/XnAOFfQ1d22KaGNSRCNtTM6thYR1v3haIfL1H6FIr QBsD8Rhwj6a05LMu7nTJddpNzAk2QfKiqMUcMoCmy5q6RF8L7pMFYRd3nVES8ZqogJ vakh4RzcRmdIXZgILSR51mTnr13lXIgOBUQqC5Vw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727759AbgJEPaZ (ORCPT ); Mon, 5 Oct 2020 11:30:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:56834 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727746AbgJEPaY (ORCPT ); Mon, 5 Oct 2020 11:30:24 -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 37D4920637; Mon, 5 Oct 2020 15:30:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911823; bh=loSTzaIyy/eWX7bIjRiRN78CodfkLCAmYrOJDPV4Vro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EC41C8R9YJoF0XRDRjlDGfDJ4uZ1sNUQxHhGbbmjFmbUDXIhVP8Bm2j6Ura16KWpz hzgx6DnXVmLeM46c/8AHvuh+xTzrfJ0DTchYCiTgVt+86EPSpb0cYTCFkPohm5qFm5 /8upkN/xrqk/mu1kGURwRj+diSBhrwMktJNVosYM= 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.4 44/57] Input: trackpoint - enable Synaptics trackpoints Date: Mon, 5 Oct 2020 17:26:56 +0200 Message-Id: <20201005142111.922933010@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005142109.796046410@linuxfoundation.org> References: <20201005142109.796046410@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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)