| Message ID | 1434081904-30944-1-git-send-email-liming.wang@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 06/11/2015 11:05 PM, Liming Wang wrote: > From: 洪一竹 <sam.hung@emc.com.tw> > > BugLink: http://bugs.launchpad.net/bugs/1464490 > > This adds new icbody type to the list recognized by Elantech PS/2 driver. > > Reported-by: Kristing Chuang <kristing.chuang@canonical.com> > Cc: stable@vger.kernel.org > Signed-off-by: Sam Hung <sam.hung@emc.com.tw> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > (cherry picked from commit 692dd1916436164e228608803dfb6cb768d6355a) > Signed-off-by: Liming Wang <liming.wang@canonical.com> > --- > drivers/input/mouse/elantech.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c > index f181d73..ce3d400 100644 > --- a/drivers/input/mouse/elantech.c > +++ b/drivers/input/mouse/elantech.c > @@ -1556,6 +1556,7 @@ static int elantech_set_properties(struct elantech_data *etd) > case 9: > case 10: > case 13: > + case 14: > etd->hw_version = 4; > break; > default: >
Applied to Trusty master-next branch.
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index f181d73..ce3d400 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1556,6 +1556,7 @@ static int elantech_set_properties(struct elantech_data *etd) case 9: case 10: case 13: + case 14: etd->hw_version = 4; break; default: