Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a417ea44 authored by Ping Cheng's avatar Ping Cheng Committed by Dmitry Torokhov
Browse files

Input: wacom - add WAC_MSG_RETRIES define 



Use WAC_MSG_RETRIES define instead of a numeric constant.

Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 18adad1c

drivers/input/tablet/wacom_sys.c

+4 −3
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct hid_descriptor { 
#define USB_REQ_GET_REPORT	0x01

#define USB_REQ_SET_REPORT	0x09

#define WAC_HID_FEATURE_REPORT	0x03

#define WAC_MSG_RETRIES		5



static int usb_get_report(struct usb_interface *intf, unsigned char type,

				unsigned char id, void *buf, int size)
@@ -165,7 +166,7 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi 
			report,

			hid_desc->wDescriptorLength,

			5000); /* 5 secs */

	} while (result < 0 && limit++ < 5);

	} while (result < 0 && limit++ < WAC_MSG_RETRIES);



	/* No need to parse the Descriptor. It isn't an error though */

	if (result < 0)
@@ -336,7 +337,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat 
				error = usb_get_report(intf,

					WAC_HID_FEATURE_REPORT, report_id,

					rep_data, 3);

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

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

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

		do {

			rep_data[0] = 2;
@@ -347,7 +348,7 @@ static int wacom_query_tablet_data(struct usb_interface *intf, struct wacom_feat 
				error = usb_get_report(intf,

					WAC_HID_FEATURE_REPORT, report_id,

					rep_data, 2);

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

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

	}



	kfree(rep_data);