diff --git a/patches.suse/HID-wacom-add-three-styli-to-wacom_intuos_get_tool_t.patch b/patches.suse/HID-wacom-add-three-styli-to-wacom_intuos_get_tool_t.patch new file mode 100644 index 0000000..4fa304a --- /dev/null +++ b/patches.suse/HID-wacom-add-three-styli-to-wacom_intuos_get_tool_t.patch @@ -0,0 +1,41 @@ +From bfdc750c4cb2f3461b9b00a2755e2145ac195c9a Mon Sep 17 00:00:00 2001 +From: Ping Cheng +Date: Wed, 28 Sep 2022 13:49:29 -0700 +Subject: [PATCH] HID: wacom: add three styli to wacom_intuos_get_tool_type +Git-commit: bfdc750c4cb2f3461b9b00a2755e2145ac195c9a +Patch-mainline: v6.1-rc1 +References: git-fixes + +We forgot to add the 3D pen ID a year ago. There are two new pro pen +IDs to be added. + +Signed-off-by: Ping Cheng +Signed-off-by: Jiri Kosina +Acked-by: Takashi Iwai + +--- + drivers/hid/wacom_wac.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c +index e4ae7fafe359..9fc080e4e66f 100644 +--- a/drivers/hid/wacom_wac.c ++++ b/drivers/hid/wacom_wac.c +@@ -713,11 +713,14 @@ static int wacom_intuos_get_tool_type(int tool_id) + case 0x802: /* Intuos4/5 13HD/24HD General Pen */ + case 0x8e2: /* IntuosHT2 pen */ + case 0x022: ++ case 0x200: /* Pro Pen 3 */ ++ case 0x04200: /* Pro Pen 3 */ + case 0x10842: /* MobileStudio Pro Pro Pen slim */ + case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */ + case 0x16802: /* Cintiq 13HD Pro Pen */ + case 0x18802: /* DTH2242 Pen */ + case 0x10802: /* Intuos4/5 13HD/24HD General Pen */ ++ case 0x80842: /* Intuos Pro and Cintiq Pro 3D Pen */ + tool_type = BTN_TOOL_PEN; + break; + +-- +2.35.3 + diff --git a/series.conf b/series.conf index ce1c698..43fc7ae 100644 --- a/series.conf +++ b/series.conf @@ -16476,6 +16476,7 @@ patches.suse/media-xilinx-vipp-Fix-refcount-leak-in-xvip_graph_dm.patch patches.suse/HID-wacom-Add-new-Intuos-Pro-Small-PTH-460-device-ID.patch patches.suse/HID-roccat-Fix-use-after-free-in-roccat_read.patch + patches.suse/HID-wacom-add-three-styli-to-wacom_intuos_get_tool_t.patch patches.suse/hid-hid-logitech-hidpp-avoid-unnecessary-assignments.patch patches.suse/HID-multitouch-Add-memory-barriers.patch patches.suse/mfd-intel_soc_pmic-Fix-an-error-handling-path-in-int.patch