aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-input.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-09-01 15:23:13 +0200
committerJiri Kosina <jkosina@suse.cz>2015-09-01 15:23:13 +0200
commit3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (patch)
treed84a437e8ed4c3e71521c739952ba96fd02b3781 /drivers/hid/hid-input.c
parentHID: wacom: Report correct device resolution when using the wireless adapater (diff)
parentHID: quirks: add QUIRK_NOGET for an other TPV touchscreen (diff)
downloadlinux-dev-3e097d1271ecdff2f251a54ddfc5eaa1f9821e96.tar.xz
linux-dev-3e097d1271ecdff2f251a54ddfc5eaa1f9821e96.zip
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.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index e3c63640df73..53aeaf6252c7 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)