| From 5792190c377af290b7acf3b05c5d5a5ea08fef01 Mon Sep 17 00:00:00 2001 |
| From: IHARA Hiroka <ihara_h@live.jp> |
| Date: Sun, 12 Feb 2017 18:34:53 -0800 |
| Subject: [PATCH] Input: elan_i2c - add ELAN0605 to the ACPI table |
| |
| commit 722c5ac708b4f5c1fcfad5fed4c95234c8b06590 upstream. |
| |
| ELAN0605 has been confirmed to be a variant of ELAN0600, which is |
| blacklisted in the hid-core to be managed by elan_i2c. This device can be |
| found in Lenovo ideapad 310s (80U4000). |
| |
| Signed-off-by: Hiroka IHARA <ihara_h@live.jp> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c |
| index d15b33813021..ed1935f300a7 100644 |
| --- a/drivers/input/mouse/elan_i2c_core.c |
| +++ b/drivers/input/mouse/elan_i2c_core.c |
| @@ -1232,6 +1232,7 @@ static const struct acpi_device_id elan_acpi_id[] = { |
| { "ELAN0000", 0 }, |
| { "ELAN0100", 0 }, |
| { "ELAN0600", 0 }, |
| + { "ELAN0605", 0 }, |
| { "ELAN1000", 0 }, |
| { } |
| }; |
| -- |
| 2.12.0 |
| |