Hi Jiri, hi Benjamin, Can one of you give the patchset a review and merge them? The first one is a bug fix. The second one is just a cleanup. Both changes are device specific. Thank you, Ping On Mon, Jul 8, 2024 at 10:57 PM Tatsunosuke Tobita <tatsunosuke.wacom@xxxxxxxxx> wrote: > > From: Tatsunosuke Tobita <tatsunosuke.tobita@xxxxxxxxx> > > The pen ID, 0x80842, was not the correct ID for wacom driver to > treat. The ID was corrected to 0x8842. > Also, 0x4200 was not the expected ID used on any Wacom device. > Therefore, 0x4200 was removed. > > Signed-off-by: Tatsunosuke Tobita <tatsunosuke.tobita@xxxxxxxxx> > Signed-off-by: Tatsunosuke Tobita <tatsunosuke.wacom@xxxxxxxxx> > Fixes: bfdc750c4cb2 ("HID: wacom: add three styli to wacom_intuos_get_tool_type") > Cc: stable@xxxxxxxxxx #6.2 > --- > drivers/hid/wacom_wac.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > index a44367aef621..20de97ce0f5e 100644 > --- a/drivers/hid/wacom_wac.c > +++ b/drivers/hid/wacom_wac.c > @@ -714,13 +714,12 @@ static int wacom_intuos_get_tool_type(int tool_id) > 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 */ > + case 0x8842: /* Intuos Pro and Cintiq Pro 3D Pen */ > tool_type = BTN_TOOL_PEN; > break; > > -- > 2.34.1 >