| Message ID | 20240709055729.17158-1-tatsunosuke.wacom@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f0d17d696dfce77c9abc830e4ac2d677890a2dad |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | [1/2] HID:wacom: Modify pen IDs | expand |
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@gmail.com> wrote: > > From: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com> > > 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@wacom.com> > Signed-off-by: Tatsunosuke Tobita <tatsunosuke.wacom@gmail.com> > Fixes: bfdc750c4cb2 ("HID: wacom: add three styli to wacom_intuos_get_tool_type") > Cc: stable@kernel.org #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 >
Hi Ping, On Jul 15 2024, Ping Cheng wrote: > 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. Let me return the question :) Can any of you Wacom guys give us a reviewed-by? :) The patches looks fine, but having someone with the impacted devices being able to test/review has a greater value than the maintainers just randomly pulling patches :) Cheers, Benjamin > > Thank you, > Ping > > On Mon, Jul 8, 2024 at 10:57 PM Tatsunosuke Tobita > <tatsunosuke.wacom@gmail.com> wrote: > > > > From: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com> > > > > 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@wacom.com> > > Signed-off-by: Tatsunosuke Tobita <tatsunosuke.wacom@gmail.com> > > Fixes: bfdc750c4cb2 ("HID: wacom: add three styli to wacom_intuos_get_tool_type") > > Cc: stable@kernel.org #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 > >
Hi Benjamin, The patchset has been reviewed by the team. Here comes: Reviewed-by: Ping Cheng <ping.cheng@wacom.com> Thank you for taking care of the patches, Ping On Tue, Jul 16, 2024 at 4:39 AM Benjamin Tissoires <bentiss@kernel.org> wrote: > > Hi Ping, > > On Jul 15 2024, Ping Cheng wrote: > > 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. > > Let me return the question :) Can any of you Wacom guys give us a > reviewed-by? :) > > The patches looks fine, but having someone with the impacted devices > being able to test/review has a greater value than the maintainers just > randomly pulling patches :) > > Cheers, > Benjamin > > > > > Thank you, > > Ping > > > > On Mon, Jul 8, 2024 at 10:57 PM Tatsunosuke Tobita > > <tatsunosuke.wacom@gmail.com> wrote: > > > > > > From: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com> > > > > > > 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@wacom.com> > > > Signed-off-by: Tatsunosuke Tobita <tatsunosuke.wacom@gmail.com> > > > Fixes: bfdc750c4cb2 ("HID: wacom: add three styli to wacom_intuos_get_tool_type") > > > Cc: stable@kernel.org #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 > > >
On Jul 16 2024, Ping Cheng wrote: > Hi Benjamin, > > The patchset has been reviewed by the team. Here comes: > > Reviewed-by: Ping Cheng <ping.cheng@wacom.com> Thanks. Unfortunately I sent the 6.11 PR to Linus yesterday and I need his feedback first before staging any new patches. Once this PR is merged I should be able to take the series in *-upstream-fixes so it gets into this cycle hopefully. Cheers, Benjamin > > Thank you for taking care of the patches, > Ping > > On Tue, Jul 16, 2024 at 4:39 AM Benjamin Tissoires <bentiss@kernel.org> wrote: > > > > Hi Ping, > > > > On Jul 15 2024, Ping Cheng wrote: > > > 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. > > > > Let me return the question :) Can any of you Wacom guys give us a > > reviewed-by? :) > > > > The patches looks fine, but having someone with the impacted devices > > being able to test/review has a greater value than the maintainers just > > randomly pulling patches :) > > > > Cheers, > > Benjamin > > > > > > > > Thank you, > > > Ping > > > > > > On Mon, Jul 8, 2024 at 10:57 PM Tatsunosuke Tobita > > > <tatsunosuke.wacom@gmail.com> wrote: > > > > > > > > From: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com> > > > > > > > > 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@wacom.com> > > > > Signed-off-by: Tatsunosuke Tobita <tatsunosuke.wacom@gmail.com> > > > > Fixes: bfdc750c4cb2 ("HID: wacom: add three styli to wacom_intuos_get_tool_type") > > > > Cc: stable@kernel.org #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 > > > >
On Tue, 09 Jul 2024 14:57:28 +0900, Tatsunosuke Tobita wrote: > 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. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git (for-6.11/upstream-fixes), thanks! [1/2] HID:wacom: Modify pen IDs https://git.kernel.org/hid/hid/c/f0d17d696dfc [2/2] HID: wacom: more appropriate tool type categorization https://git.kernel.org/hid/hid/c/9c2913b962da Cheers,
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;