Commit 44b96838 authored by Ping Cheng's avatar Ping Cheng Committed by Jiri Kosina

HID: wacom - make sure touch_input is valid before using it

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.htmlReviewed-by: default avatarHans Petter Selasky <hps@selasky.org>
Tested-by: default avatarDenis Akiyakov <d.akiyakov@gmail.com>
Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 7f474df0
...@@ -1681,7 +1681,9 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) ...@@ -1681,7 +1681,9 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
return 0; return 0;
if (data[0] == WACOM_REPORT_USB) { 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, input_report_switch(wacom->shared->touch_input,
SW_MUTE_DEVICE, data[8] & 0x40); SW_MUTE_DEVICE, data[8] & 0x40);
input_sync(wacom->shared->touch_input); input_sync(wacom->shared->touch_input);
...@@ -1774,7 +1776,8 @@ static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len) ...@@ -1774,7 +1776,8 @@ static int wacom_wireless_irq(struct wacom_wac *wacom, size_t len)
int pid, battery, ps_connected; int pid, battery, ps_connected;
if ((wacom->shared->type == INTUOSHT) && if ((wacom->shared->type == INTUOSHT) &&
wacom->shared->touch_max) { wacom->shared->touch_input &&
wacom->shared->touch_max) {
input_report_switch(wacom->shared->touch_input, input_report_switch(wacom->shared->touch_input,
SW_MUTE_DEVICE, data[5] & 0x40); SW_MUTE_DEVICE, data[5] & 0x40);
input_sync(wacom->shared->touch_input); input_sync(wacom->shared->touch_input);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment