Commit 3dc9f40d authored by Chris Bagwell's avatar Chris Bagwell Committed by Dmitry Torokhov
Browse files

Input: wacom - request tablet data for Bamboo Pens 



Bamboo P&T need to use second form of usb_set_report() to
ask to report tablet data.

With previous addition of Bamboo Touch, BTN_TOOL_TRIPLETAP is now used
for both TABLETPC2FG and BAMBOO_PT types.  So reduced check to
match type=TABLETPC2FG.

This change shows redundant check for !TABLETPC2FG in else statement.

Signed-off-by: default avatarChris Bagwell <chris@cnpbagwell.com>
Acked-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent a0bf0ea8

drivers/input/tablet/wacom_sys.c

+5 −4
Original line number Diff line number Diff line
@@ -319,8 +319,9 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat 
	if (!rep_data)

		return error;



	/* ask to report tablet data if it is 2FGT or not a Tablet PC */

	if (features->device_type == BTN_TOOL_TRIPLETAP) {

	/* ask to report tablet data if it is 2FGT Tablet PC or

	 * not a Tablet PC */

	if (features->type == TABLETPC2FG) {

		do {

			rep_data[0] = 3;

			rep_data[1] = 4;
@@ -332,7 +333,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat 
					WAC_HID_FEATURE_REPORT, report_id,

					rep_data, 3);

		} while ((error < 0 || rep_data[1] != 4) && limit++ < 5);

	} else if (features->type != TABLETPC && features->type != TABLETPC2FG) {

	} else if (features->type != TABLETPC) {

		do {

			rep_data[0] = 2;

			rep_data[1] = 2;
@@ -364,7 +365,7 @@ static int wacom_retrieve_hid_descriptor(struct usb_interface *intf, 
	features->pressure_fuzz = 0;

	features->distance_fuzz = 0;



	/* only Tablet PCs need to retrieve the info */

	/* only Tablet PCs and Bamboo P&T need to retrieve the info */

	if ((features->type != TABLETPC) && (features->type != TABLETPC2FG) &&

	    (features->type != BAMBOO_PT))

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE