diff options
| author | Jiri Kosina <jkosina@suse.com> | 2015-07-17 11:19:37 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2015-07-17 11:19:37 +0200 |
| commit | 57f7e160a137f8ddae455f15abed9bdd1b90ab63 (patch) | |
| tree | 92993f2b4015a21bf645ba4d14e75dd73a624261 /drivers/hid/hid-input.c | |
| parent | 70caee0a3721956a98cb4bfbfa0eaa38c9182e44 (diff) | |
| parent | 3eb4351af42bd8b6de20daab07b204a85c35248f (diff) | |
| download | op-kernel-dev-57f7e160a137f8ddae455f15abed9bdd1b90ab63.zip op-kernel-dev-57f7e160a137f8ddae455f15abed9bdd1b90ab63.tar.gz | |
Merge branch 'for-4.3/upstream' into for-4.3/wacom
There is a conflict between 67e123f ("Delete unnecessary checks") sitting
in for-4.3/upstream and memory allocation failure handling from Jason Gerecke.
Pull this so that conflict could be resolved.
Signed-off-by: Jiri Kosina <jkosina@suse.com>
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 3511bbab..14aebe4 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -1163,8 +1163,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) |
