Commit 26ba61f8 authored May 19, 2015 by Ping Cheng Committed by Jiri Kosina May 20, 2015

HID: wacom: fix an Oops caused by wacom_wac_finger_count_touches



We assumed all touch interfaces report touch data. But, Bamboo
and Intuos non-touch devices report express keys on touch
interface. We need to check touch_max before counting touches.

Reported-by: Tasos Sahanidis <tasos@tasossah.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent 849eca7b

drivers/hid/wacom_wac.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1072,6 +1072,9 @@ static int wacom_wac_finger_count_touches(struct wacom_wac *wacom)
		int count = 0;
		int i;

		if (!touch_max)
		return 0;

		/* non-HID_GENERIC single touch input doesn't call this routine */
		if ((touch_max == 1) && (wacom->features.type == HID_GENERIC))
		return wacom->hid_data.tipswitch &&