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

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

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.
 	 */
 	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;

-- 
2.4.2

On 6/18/2015 12:58 PM, Benjamin Tissoires wrote:

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@wacom.com>

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

On Thu, 18 Jun 2015, 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 <redacted>

Could you please be a little bit more specific about which commit this is 
a bugfix for?

Thanks a lot.

-- 
Jiri Kosina
SUSE Labs

On Jun 29 2015 or thereabouts, Jiri Kosina wrote:

On Thu, 18 Jun 2015, Benjamin Tissoires wrote:

quoted

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

Could you please be a little bit more specific about which commit this is 
a bugfix for?

Jason, Jiri,

OK, I will amend the patch and send a v2 this week (Thursday maybe when
I get my hand on the Bamboo PAD).

Cheers,
Benjamin