Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 298579 | Differences between
and this patch

Collapse All | Expand All

(-)linuxwacom-0.8.4-1/src/xdrv/wcmUSB.c (-8 / +2 lines)
Lines 527-533 Link Here
527
	ioctl(local->fd, EVIOCGNAME(sizeof(id)), id);
527
	ioctl(local->fd, EVIOCGNAME(sizeof(id)), id);
528
528
529
	/* vendor is wacom */
529
	/* vendor is wacom */
530
	if (sID[1] == 0x056A)
530
	if (sID[1] == 0x056A || sID[1] == 0x172f)
531
	{
531
	{
532
		common->tablet_id = sID[2];
532
		common->tablet_id = sID[2];
533
533
Lines 853-864 Link Here
853
	if ((event->type == EV_MSC) && (event->code == MSC_SERIAL))
853
	if ((event->type == EV_MSC) && (event->code == MSC_SERIAL))
854
	{
854
	{
855
		/* save the serial number so we can look up the channel number later */
855
		/* save the serial number so we can look up the channel number later */
856
		if (event->value == 0) /* serial number should never be 0 */
857
		{
858
			ErrorF("usbParse: Ignoring event from invalid serial 0\n");
859
			goto skipEvent;
860
			return;
861
		}
862
		common->wcmLastToolSerial = event->value;
856
		common->wcmLastToolSerial = event->value;
863
857
864
		/* if SYN_REPORT is end of record indicator, we are done */
858
		/* if SYN_REPORT is end of record indicator, we are done */
Lines 897-903 Link Here
897
		else
891
		else
898
			channel = 0;
892
			channel = 0;
899
	}
893
	}
900
	else if (common->wcmLastToolSerial) /* serial number should never be 0 */
894
	else
901
	{
895
	{
902
		/* ignore events without information */
896
		/* ignore events without information */
903
		if (common->wcmEventCnt <= 2) 
897
		if (common->wcmEventCnt <= 2) 

Return to bug 298579