From: Aaron Armstrong Skomra <skomra@gmail.com>
Date: Wed, 29 Mar 2017 18:41:28 +0000 (-0700)
Subject: HID: wacom: call _query_tablet_data() for BAMBOO_TOUCH
X-Git-Tag: v5.15~11408^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d20c332de377fa5b06c46f6f34174c10dd998e4;p=platform%2Fkernel%2Flinux-starfive.git

HID: wacom: call _query_tablet_data() for BAMBOO_TOUCH

Commit a544c619a54b ("HID: wacom: do not attempt to switch mode
while in probe") introduces delayed work for querying (setting the
mode) on all tablets. Bamboo Touch (056a:00d0) has a ghost
interface which claims to be a pen device. Though this device can
be removed, we have to set the mode on the ghost pen interface
before we remove it. After the aforementioned delay was introduced
the device was being removed before the mode setting could be
executed.

Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index b676f02d4b7f..e2666ef84dc1 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2216,6 +2216,8 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
 	/* touch only Bamboo doesn't support pen */
 	if ((features->type == BAMBOO_TOUCH) &&
 	    (features->device_type & WACOM_DEVICETYPE_PEN)) {
+		cancel_delayed_work_sync(&wacom->init_work);
+		_wacom_query_tablet_data(wacom);
 		error = -ENODEV;
 		goto fail_quirks;
 	}