Commit 599b0820 authored by Ping Cheng's avatar Ping Cheng Committed by Jiri Kosina
Browse files

HID: wacom - request tool info only when we get general events 



Move wacom_intuos_schedule_prox_event inside wacom_intuos_general
so we don't call it when general event data isn't ready.

Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Reviewed-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent c2848f2e

drivers/hid/wacom_wac.c

+7 −7
Original line number Diff line number Diff line
@@ -750,13 +750,6 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) 
		return 2;

	}



	/* don't report other events if we don't know the ID */

	if (!wacom->id[idx]) {

		/* but reschedule a read of the current tool */

		wacom_intuos_schedule_prox_event(wacom);

		return 1;

	}



	return 0;

}
@@ -897,6 +890,13 @@ static int wacom_intuos_general(struct wacom_wac *wacom) 
		data[0] != WACOM_REPORT_INTUOS_PEN)

		return 0;



	/* don't report events if we don't know the tool ID */

	if (!wacom->id[idx]) {

		/* but reschedule a read of the current tool */

		wacom_intuos_schedule_prox_event(wacom);

		return 1;

	}



	x = (be16_to_cpup((__be16 *)&data[2]) << 1) | ((data[9] >> 1) & 1);

	y = (be16_to_cpup((__be16 *)&data[4]) << 1) | (data[9] & 1);

	distance = data[9] >> 2;