releases/3.0.18/hid-hid-multitouch-add-another-egalax-id.patch

   1 From 1fd8f047490dd0ec4e4db710fcbc1bd4798d944c Mon Sep 17 00:00:00 2001
   2 From: Chris Bagwell <chris@cnpbagwell.com>
   3 Date: Wed, 23 Nov 2011 10:54:27 +0100
   4 Subject: HID: hid-multitouch - add another eGalax id
   5
   6 From: Chris Bagwell <chris@cnpbagwell.com>
   7
   8 commit 1fd8f047490dd0ec4e4db710fcbc1bd4798d944c upstream.
   9
  10 This allows ASUS Eee Slate touchscreens to work.
  11
  12 Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
  13 Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
  14 Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16
  17 ---
  18  drivers/hid/hid-core.c       |    1 +
  19  drivers/hid/hid-ids.h        |    1 +
  20  drivers/hid/hid-multitouch.c |    3 +++
  21  3 files changed, 5 insertions(+)
  22
  23 --- a/drivers/hid/hid-core.c
  24 +++ b/drivers/hid/hid-core.c
  25 @@ -1387,6 +1387,7 @@ static const struct hid_device_id hid_ha
  26         { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },
  27         { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
  28         { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
  29 +       { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
  30         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
  31         { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
  32         { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
  33 --- a/drivers/hid/hid-ids.h
  34 +++ b/drivers/hid/hid-ids.h
  35 @@ -235,6 +235,7 @@
  36  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2  0x72a1
  37  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3  0x480e
  38  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4  0x726b
  39 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5  0xa001
  40
  41  #define USB_VENDOR_ID_ELECOM           0x056e
  42  #define USB_DEVICE_ID_ELECOM_BM084     0x0061
  43 --- a/drivers/hid/hid-multitouch.c
  44 +++ b/drivers/hid/hid-multitouch.c
  45 @@ -646,6 +646,9 @@ static const struct hid_device_id mt_dev
  46         {  .driver_data = MT_CLS_EGALAX,
  47                 HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
  48                         USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
  49 +       {  .driver_data = MT_CLS_EGALAX,
  50 +               HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
  51 +                       USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH5) },
  52
  53         /* Elo TouchSystems IntelliTouch Plus panel */
  54         { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,