diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2014-09-23 11:09:28 -0700 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-17 14:11:54 +0000 |
| commit | b0bb0aa3f5f6a688ddfce4c7a31a7c9710fe738c (patch) | |
| tree | 98e176a8f5d225361785371f9a6eea75cf873a00 | |
| parent | 1cf39b5f88166c08b9bf9917b16c598fe9e68ab7 (diff) | |
HID: input: Fix TransducerSerialNumber implementation
commit 5989a55a4c9aafba8b152c6bf52244510c2b88b9 upstream.
The commit which introduced TransducerSerialNumber (368c966) is missing
two crucial implementation details. Firstly, the commit does not set the
type/code/bit/max fields as expected later down the code which can cause
the driver to crash when a tablet with this usage is connected. Secondly,
the call to 'set_bit' causes MSC_PULSELED to be sent instead of the
expected MSC_SERIAL. This commit addreses both issues.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/hid/hid-input.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 2619f7f4517a..cb1b3faedb97 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -689,7 +689,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel break; case 0x5b: /* TransducerSerialNumber */ - set_bit(MSC_SERIAL, input->mscbit); + usage->type = EV_MSC; + usage->code = MSC_SERIAL; + bit = input->mscbit; + max = MSC_MAX; break; default: goto unknown; |