Commit f73d08d0 authored by Jason Gerecke's avatar Jason Gerecke Committed by Jiri Kosina
Browse files

HID: wacom: Limit touchstrip data to 13 bits 



Commit c7f0522a uses sixteen bits of data in the construction of 'strip1'
and 'strip2'. This can cause problems in some cases, however, since some
tablets store flags in the MSB of data[2] and data[4] that should not be
included in these values. This restores the 0x1f mask that used prior
to c7f0522a.

Signed-off-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 8f9cfdd3

drivers/hid/wacom_wac.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -545,8 +545,8 @@ static int wacom_intuos_pad(struct wacom_wac *wacom) 
			          ((data[6] & 0x0F) << 4)  |

			          ((data[6] & 0x0F) << 4)  |

			          (data[5] & 0x0F);

			          (data[5] & 0x0F);

		}

		}

		strip1 = (data[1] << 8) | data[2];

		strip1 = ((data[1] & 0x1f) << 8) | data[2];

		strip2 = (data[3] << 8) | data[4];

		strip2 = ((data[3] & 0x1f) << 8) | data[4];

	}

	}





	prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |

	prox = (buttons & ~(~0 << nbuttons)) | (keys & ~(~0 << nkeys)) |

CRA Git | Maintained and supported by SUSTech CRA and CCSE