HID: wacom: generic: add touchring adjustment for 2nd Gen Pro Small
diff mbox series

Message ID 1561589328-32520-1-git-send-email-aaron.skomra@wacom.com
State Mainlined
Commit 6e2abc68585b0942257f6198944b8a0e24c67d8f
Delegated to: Jiri Kosina
Headers show
Series
  • HID: wacom: generic: add touchring adjustment for 2nd Gen Pro Small
Related show

Commit Message

Aaron Armstrong Skomra June 26, 2019, 10:48 p.m. UTC
Add the product ID for the 2nd Generation Intuos Pro
Small to the touchring coordinate adjustment block.

Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
---
 drivers/hid/wacom_wac.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Benjamin Tissoires July 2, 2019, 9:58 a.m. UTC | #1
On Thu, Jun 27, 2019 at 12:49 AM Aaron Armstrong Skomra
<skomra@gmail.com> wrote:
>
> Add the product ID for the 2nd Generation Intuos Pro
> Small to the touchring coordinate adjustment block.
>
> Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
> Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
> ---

Applied to for-5.3/wacom

Cheers,
Benjamin

>  drivers/hid/wacom_wac.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> index e35d04451595..35942bba5390 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -2029,10 +2029,12 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field
>                 if (hdev->vendor == 0x56a &&
>                     (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 == 0x399)) {                           /* MobileStudio Pro */
>                         value = (field->logical_maximum - value);
>
> -                       if (hdev->product == 0x357 || hdev->product == 0x358)
> +                       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 == 0x399)
> --
> 2.17.1
>

Patch
diff mbox series

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index e35d04451595..35942bba5390 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2029,10 +2029,12 @@  static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field
 		if (hdev->vendor == 0x56a &&
 		    (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 == 0x399)) {				  /* MobileStudio Pro */
 			value = (field->logical_maximum - value);
 
-			if (hdev->product == 0x357 || hdev->product == 0x358)
+			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 == 0x399)