HID: wacom: Recognize new MobileStudio Pro PID
diff mbox series

Message ID 20191216181857.10783-1-jason.gerecke@wacom.com
State Mainlined
Commit fe4e940f0f91b4a506f048b42e00386f5ad322b6
Delegated to: Benjamin Tissoires
Headers show
Series
  • HID: wacom: Recognize new MobileStudio Pro PID
Related show

Commit Message

Gerecke, Jason Dec. 16, 2019, 6:18 p.m. UTC
From: Jason Gerecke <killertofu@gmail.com>

A new PID is in use for repaired MobileStudio Pro devices. Add it to the
list of devices that need special-casing in wacom_wac_pad_event.

Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
---
 drivers/hid/wacom_wac.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Benjamin Tissoires Dec. 18, 2019, 3:54 p.m. UTC | #1
On Mon, Dec 16, 2019 at 7:19 PM Gerecke, Jason <killertofu@gmail.com> wrote:
>
> From: Jason Gerecke <killertofu@gmail.com>
>
> A new PID is in use for repaired MobileStudio Pro devices. Add it to the
> list of devices that need special-casing in wacom_wac_pad_event.
>
> Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
> ---

Thanks,

Applied to for-5.5/upstream-fixes

Cheers,
Benjamin

>  drivers/hid/wacom_wac.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> index ccb74529bc78..d99a9d407671 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -2096,14 +2096,16 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field
>                     (hdev->product == 0x34d || hdev->product == 0x34e ||  /* MobileStudio Pro */
>                      hdev->product == 0x357 || hdev->product == 0x358 ||  /* Intuos Pro 2 */
>                      hdev->product == 0x392 ||                            /* Intuos Pro 2 */
> -                    hdev->product == 0x398 || hdev->product == 0x399)) { /* MobileStudio Pro */
> +                    hdev->product == 0x398 || hdev->product == 0x399 ||  /* MobileStudio Pro */
> +                    hdev->product == 0x3AA)) {                           /* MobileStudio Pro */
>                         value = (field->logical_maximum - value);
>
>                         if (hdev->product == 0x357 || hdev->product == 0x358 ||
>                             hdev->product == 0x392)
>                                 value = wacom_offset_rotation(input, usage, value, 3, 16);
>                         else if (hdev->product == 0x34d || hdev->product == 0x34e ||
> -                                hdev->product == 0x398 || hdev->product == 0x399)
> +                                hdev->product == 0x398 || hdev->product == 0x399 ||
> +                                hdev->product == 0x3AA)
>                                 value = wacom_offset_rotation(input, usage, value, 1, 2);
>                 }
>                 else {
> --
> 2.24.1
>

Patch
diff mbox series

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index ccb74529bc78..d99a9d407671 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2096,14 +2096,16 @@  static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field
 		    (hdev->product == 0x34d || hdev->product == 0x34e ||  /* MobileStudio Pro */
 		     hdev->product == 0x357 || hdev->product == 0x358 ||  /* Intuos Pro 2 */
 		     hdev->product == 0x392 ||				  /* Intuos Pro 2 */
-		     hdev->product == 0x398 || hdev->product == 0x399)) { /* MobileStudio Pro */
+		     hdev->product == 0x398 || hdev->product == 0x399 ||  /* MobileStudio Pro */
+		     hdev->product == 0x3AA)) {				  /* MobileStudio Pro */
 			value = (field->logical_maximum - value);
 
 			if (hdev->product == 0x357 || hdev->product == 0x358 ||
 			    hdev->product == 0x392)
 				value = wacom_offset_rotation(input, usage, value, 3, 16);
 			else if (hdev->product == 0x34d || hdev->product == 0x34e ||
-				 hdev->product == 0x398 || hdev->product == 0x399)
+				 hdev->product == 0x398 || hdev->product == 0x399 ||
+				 hdev->product == 0x3AA)
 				value = wacom_offset_rotation(input, usage, value, 1, 2);
 		}
 		else {