diff options
author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:23:13 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:23:13 +0200 |
commit | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (patch) | |
tree | d84a437e8ed4c3e71521c739952ba96fd02b3781 /drivers/hid/hid-input.c | |
parent | 0be017120b80f0fe3da9a8239f989a27e54828f2 (diff) | |
parent | c9b57724b38d4c1555ee49418be3d76801e3327c (diff) | |
download | op-kernel-dev-3e097d1271ecdff2f251a54ddfc5eaa1f9821e96.zip op-kernel-dev-3e097d1271ecdff2f251a54ddfc5eaa1f9821e96.tar.gz |
Merge branches 'for-4.2/upstream-fixes-devm-fixed' and 'for-4.3/upstream' into for-linus
Diffstat (limited to 'drivers/hid/hid-input.c')
-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 e3c6364..53aeaf6 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -1166,8 +1166,11 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct input_event(input, usage->type, usage->code, value); - if ((field->flags & HID_MAIN_ITEM_RELATIVE) && (usage->type == EV_KEY)) + if ((field->flags & HID_MAIN_ITEM_RELATIVE) && + usage->type == EV_KEY && value) { + input_sync(input); input_event(input, usage->type, usage->code, 0); + } } void hidinput_report_event(struct hid_device *hid, struct hid_report *report) |