Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751867AbdILQzy (ORCPT ); Tue, 12 Sep 2017 12:55:54 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:47306 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751831AbdILQzu (ORCPT ); Tue, 12 Sep 2017 12:55:50 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Oscar Campos , Peter Hutterer , Dmitry Torokhov , Aaron Ma Subject: [PATCH 3.18 08/19] Input: trackpoint - assume 3 buttons when buttons detection fails Date: Tue, 12 Sep 2017 09:54:44 -0700 Message-Id: <20170912165016.518256530@linuxfoundation.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170912165016.208029904@linuxfoundation.org> References: <20170912165016.208029904@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1381 Lines: 37 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oscar Campos commit 293b915fd9bebf33cdc906516fb28d54649a25ac upstream. Trackpoint buttons detection fails on ThinkPad 570 and 470 series, this makes the middle button of the trackpoint to not being recogized. As I don't believe there is any trackpoint with less than 3 buttons this patch just assumes three buttons when the extended button information read fails. Signed-off-by: Oscar Campos Acked-by: Peter Hutterer Signed-off-by: Dmitry Torokhov Signed-off-by: Aaron Ma Signed-off-by: Greg Kroah-Hartman --- drivers/input/mouse/trackpoint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c @@ -377,8 +377,8 @@ int trackpoint_detect(struct psmouse *ps return 0; if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) { - psmouse_warn(psmouse, "failed to get extended button data\n"); - button_info = 0; + psmouse_warn(psmouse, "failed to get extended button data, assuming 3 buttons\n"); + button_info = 0x33; } psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL);