HID: wacom - make sure touch_input is valid before using it (44b96838) · Commits · 戴 / test

touch_input is stored in wacom_shared for pen data to report touch switch status. It is possible, although we didn't see it happen on Linux yet, that pen data is procesed before touch interface is fully probed. As a by-product of this patch, it fixes the FreeBSD issue reported by Denis Akiyakov http://www.spinics.net/lists/linux-input/msg33971.html Reviewed-by:

Hans Petter Selasky <hps@selasky.org> Tested-by:

Denis Akiyakov <d.akiyakov@gmail.com> Signed-off-by:

Ping Cheng <pingc@wacom.com> Signed-off-by:

Jiri Kosina <jkosina@suse.cz>

drivers/hid/wacom_wac.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1681,7 +1681,9 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
		return 0;

		if (data[0] == WACOM_REPORT_USB) {
		if (features->type == INTUOSHT && features->touch_max) {
		if (features->type == INTUOSHT &&
		wacom->shared->touch_input &&
		features->touch_max) {
		input_report_switch(wacom->shared->touch_input,
		SW_MUTE_DEVICE, data[8] & 0x40);
		input_sync(wacom->shared->touch_input);
		@@ -1774,6 +1776,7 @@ static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
		int pid, battery, ps_connected;

		if ((wacom->shared->type == INTUOSHT) &&
		wacom->shared->touch_input &&
		wacom->shared->touch_max) {
		input_report_switch(wacom->shared->touch_input,
		SW_MUTE_DEVICE, data[5] & 0x40);

Admin message