diff mbox

HID: wacom: generic: Recognize WACOM_HID_WD_PEN as a type of pen collection

Message ID 20171018152713.22633-1-killertofu@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gerecke, Jason Oct. 18, 2017, 3:27 p.m. UTC
The WACOM_PEN_FIELD macro is used to determine if a given HID field should be
associated with pen input. This field includes several known collection types
that Wacom pen data is contained in, but the WACOM_HID_WD_PEN application
collection type is notably missing. This can result in fields within this
kind of collection being completely ignored by the `wacom_usage_mapping`
function, preventing the later '*_event' functions from being notified about
changes to their value.

Fixes: c9c095874a ("HID: wacom: generic: Support and use 'Custom HID' mode and usages")
Fixes: ac2423c975 ("HID: wacom: generic: add vendor defined touch")
Cc: stable@vger.kernel.org
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
---
 drivers/hid/wacom_wac.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Benjamin Tissoires Oct. 18, 2017, 4:38 p.m. UTC | #1
On Oct 18 2017 or thereabouts, Jason Gerecke wrote:
> The WACOM_PEN_FIELD macro is used to determine if a given HID field should be
> associated with pen input. This field includes several known collection types
> that Wacom pen data is contained in, but the WACOM_HID_WD_PEN application
> collection type is notably missing. This can result in fields within this
> kind of collection being completely ignored by the `wacom_usage_mapping`
> function, preventing the later '*_event' functions from being notified about
> changes to their value.
> 
> Fixes: c9c095874a ("HID: wacom: generic: Support and use 'Custom HID' mode and usages")
> Fixes: ac2423c975 ("HID: wacom: generic: add vendor defined touch")
> Cc: stable@vger.kernel.org
> Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
> ---

Looks good:
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

>  drivers/hid/wacom_wac.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
> index 8a03654048bf..feb62fd4dfc3 100644
> --- a/drivers/hid/wacom_wac.h
> +++ b/drivers/hid/wacom_wac.h
> @@ -166,6 +166,7 @@
>  				 ((f)->physical == HID_DG_PEN) || \
>  				 ((f)->application == HID_DG_PEN) || \
>  				 ((f)->application == HID_DG_DIGITIZER) || \
> +				 ((f)->application == WACOM_HID_WD_PEN) || \
>  				 ((f)->application == WACOM_HID_WD_DIGITIZER) || \
>  				 ((f)->application == WACOM_HID_G9_PEN) || \
>  				 ((f)->application == WACOM_HID_G11_PEN))
> -- 
> 2.14.2
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jiri Kosina Oct. 19, 2017, 8:22 a.m. UTC | #2
On Wed, 18 Oct 2017, Jason Gerecke wrote:

> The WACOM_PEN_FIELD macro is used to determine if a given HID field should be
> associated with pen input. This field includes several known collection types
> that Wacom pen data is contained in, but the WACOM_HID_WD_PEN application
> collection type is notably missing. This can result in fields within this
> kind of collection being completely ignored by the `wacom_usage_mapping`
> function, preventing the later '*_event' functions from being notified about
> changes to their value.
> 
> Fixes: c9c095874a ("HID: wacom: generic: Support and use 'Custom HID' mode and usages")
> Fixes: ac2423c975 ("HID: wacom: generic: add vendor defined touch")
> Cc: stable@vger.kernel.org
> Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>

Applied to for-4.14/upstream-fixes
Gerecke, Jason Nov. 9, 2017, 4:54 p.m. UTC | #3
On Thu, Oct 19, 2017 at 1:22 AM, Jiri Kosina <jikos@kernel.org> wrote:
> On Wed, 18 Oct 2017, Jason Gerecke wrote:
>
>> The WACOM_PEN_FIELD macro is used to determine if a given HID field should be
>> associated with pen input. This field includes several known collection types
>> that Wacom pen data is contained in, but the WACOM_HID_WD_PEN application
>> collection type is notably missing. This can result in fields within this
>> kind of collection being completely ignored by the `wacom_usage_mapping`
>> function, preventing the later '*_event' functions from being notified about
>> changes to their value.
>>
>> Fixes: c9c095874a ("HID: wacom: generic: Support and use 'Custom HID' mode and usages")
>> Fixes: ac2423c975 ("HID: wacom: generic: add vendor defined touch")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
>
> Applied to for-4.14/upstream-fixes
>
> --
> Jiri Kosina
> SUSE Labs
>

Was this branch ever sent to Linus? I don't see any mention of it (or
this patch) in the 4.14-rc8 history...

Jason
---
Now instead of four in the eights place /
you’ve got three, ‘Cause you added one  /
(That is to say, eight) to the two,     /
But you can’t take seven from three,    /
So you look at the sixty-fours....
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jiri Kosina Nov. 10, 2017, 8:45 a.m. UTC | #4
On Thu, 9 Nov 2017, Jason Gerecke wrote:

> Was this branch ever sent to Linus? I don't see any mention of it (or 
> this patch) in the 4.14-rc8 history...

I take the blame here; last few weeks were a bit crazy for me, and this 
slipped through cracks.

I'll be submitting the whole lot for stable, so that it gets included 
everywhere properly.
diff mbox

Patch

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 8a03654048bf..feb62fd4dfc3 100644
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -166,6 +166,7 @@ 
 				 ((f)->physical == HID_DG_PEN) || \
 				 ((f)->application == HID_DG_PEN) || \
 				 ((f)->application == HID_DG_DIGITIZER) || \
+				 ((f)->application == WACOM_HID_WD_PEN) || \
 				 ((f)->application == WACOM_HID_WD_DIGITIZER) || \
 				 ((f)->application == WACOM_HID_G9_PEN) || \
 				 ((f)->application == WACOM_HID_G11_PEN))