diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:25:50 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-06-08 11:25:50 +0300 |
| commit | 25721aefe1d0b0d604d66fb5912fb383ce56c6ac (patch) | |
| tree | 4da443dbf4be259191b8386d90933fa3f0b75a1d /drivers/hid/hid-magicmouse.c | |
| parent | 72d0beb4d6d4b17f925fc6d1e9ebfb548f2e809c (diff) | |
| parent | abb36fe691b28f2a64926b61448d6b9610ed879a (diff) | |
| download | linux-25721aefe1d0b0d604d66fb5912fb383ce56c6ac.tar.xz | |
Merge branch 'for-4.18/multitouch' into for-linus
- improvement of duplicate usage handling in hid-input from Benjamin Tissoires
- Win 8.1 precisioun touchpad spec implementation from Benjamin Tissoires
Diffstat (limited to 'drivers/hid/hid-magicmouse.c')
| -rw-r--r-- | drivers/hid/hid-magicmouse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 42ed887ba0be..b454c4386157 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -531,12 +531,12 @@ static int magicmouse_probe(struct hid_device *hdev, if (id->product == USB_DEVICE_ID_APPLE_MAGICMOUSE) report = hid_register_report(hdev, HID_INPUT_REPORT, - MOUSE_REPORT_ID); + MOUSE_REPORT_ID, 0); else { /* USB_DEVICE_ID_APPLE_MAGICTRACKPAD */ report = hid_register_report(hdev, HID_INPUT_REPORT, - TRACKPAD_REPORT_ID); + TRACKPAD_REPORT_ID, 0); report = hid_register_report(hdev, HID_INPUT_REPORT, - DOUBLE_REPORT_ID); + DOUBLE_REPORT_ID, 0); } if (!report) { |