Re: [PATCH] HID: wacom: remove the extra Pen interface for Wacom Bamboo PAD

From: Jason Gerecke
Date: Fri Jun 19 2015 - 12:06:14 EST


On 6/18/2015 12:58 PM, Benjamin Tissoires wrote:
> As mentioned in the comment in the code, both the pen and touch data
> come from the interface tagged as BAMBOO_PAD. The driver re-routes the
> events for the Pen to the generic HID interface and keeps the ones for
> the touch through this current interface.
>
> Clearing the WACOM_DEVICETYPE_PEN bit removes the extra unused interface
> and makes the Bamboo PAD to behave like in 4.1.
>
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
> ---
>
> Hi,
>
> well, the fix was definitively easy to restore the Bamboo PAD interface.
>
> Thanks Jason for the good cleanup and sorry for not having the time to review
> the previous series.
>
> Cheers,
> Benjamin
>
> drivers/hid/wacom_wac.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> index 232da89..d260528 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -2223,7 +2223,7 @@ void wacom_setup_device_quirks(struct wacom *wacom)
> * so rewrite this one to be of type BTN_TOOL_FINGER.

Nit: Looks like I forgot to update this comment to say
WACOM_DEVICETYPE_TOUCH. Mind fixing that in this patch since you're here
anyway?

Otherwise, looks good :)

Reviewed-by: Jason Gerecke <jason.gerecke@xxxxxxxxx>

--
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....

> */
> if (features->type == BAMBOO_PAD)
> - features->device_type |= WACOM_DEVICETYPE_TOUCH;
> + features->device_type = WACOM_DEVICETYPE_TOUCH;
>
> if (wacom->hdev->bus == BUS_BLUETOOTH)
> features->quirks |= WACOM_QUIRK_BATTERY;
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at http://www.tux.org/lkml/