[PATCH 2/3] HID: wacom: Initialize hid_data.inputmode to -1

Chris J Arges chris.j.arges at canonical.com
Mon Jul 18 12:48:44 UTC 2016


From: Jason Gerecke <killertofu at gmail.com>

BugLink: http://bugs.launchpad.net/bugs/1603975

Commit 5ae6e89 introduced hid_data.inputmode with a comment that it
would have the value -1 if undefined, but then forgot to actually
perform the initialization. Although this doesn't appear to have
caused any problems in practice, it should still be remedied.

Signed-off-by: Jason Gerecke <jason.gerecke at wacom.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires at redhat.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
(cherry picked from commit c6fa1aeba02111ed8676494ac7cd453a03efef3c)
Signed-off-by: Chris J Arges <chris.j.arges at canonical.com>
---
 drivers/hid/wacom_sys.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 2275e88..718a1ba 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -1844,6 +1844,8 @@ static int wacom_probe(struct hid_device *hdev,
 		goto fail_type;
 	}
 
+	wacom_wac->hid_data.inputmode = -1;
+
 	wacom->usbdev = dev;
 	wacom->intf = intf;
 	mutex_init(&wacom->lock);
-- 
2.7.4





More information about the kernel-team mailing list