From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754357AbbBSAqx (ORCPT ); Wed, 18 Feb 2015 19:46:53 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:35651 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753821AbbBSAe2 (ORCPT ); Wed, 18 Feb 2015 19:34:28 -0500 From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Yi ju Hong , Dmitry Torokhov , Kamal Mostafa Subject: [PATCH 3.13.y-ckt 071/103] Input: elantech - support new ICs types for version 4 Date: Wed, 18 Feb 2015 16:32:38 -0800 Message-Id: <1424305990-17983-72-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424305990-17983-1-git-send-email-kamal@canonical.com> References: <1424305990-17983-1-git-send-email-kamal@canonical.com> X-Extended-Stable: 3.13 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.13.11-ckt16 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Sam hung commit 810aa0918b2b032684c8cad13f73d6ba37ad11c0 upstream. This change allows the driver to recognize newer Elantech touchpads. Signed-off-by: Yi ju Hong Signed-off-by: Dmitry Torokhov [ kamal: backport to 3.13-stable: picked up case 9 also ] Signed-off-by: Kamal Mostafa --- drivers/input/mouse/elantech.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 0b75b57..e66780e 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1396,6 +1396,9 @@ static int elantech_set_properties(struct elantech_data *etd) case 6: case 7: case 8: + case 9: + case 10: + case 13: etd->hw_version = 4; break; default: -- 1.9.1