Skip to content

Commit 7774036

Browse files
dtordtor
committed
Merge branch 'for-next' of git://github.com/rydberg/linux into next
Merge Henrik's updates to multitouch code. Even though Jiri already pulled them in I need to do it too since my changes to evdev using dynamic major would clash with them.
2 parents fb4f552 + 51c80b7 commit 7774036

25 files changed

Lines changed: 850 additions & 469 deletions

‎drivers/hid/hid-ids.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,9 @@
283283
#define USB_VENDOR_ID_EMS 0x2006
284284
#define USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II 0x0118
285285

286+
#define USB_VENDOR_ID_FLATFROG 0x25b5
287+
#define USB_DEVICE_ID_MULTITOUCH_3200 0x0002
288+
286289
#define USB_VENDOR_ID_ESSENTIAL_REALITY 0x0d7f
287290
#define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
288291

‎drivers/hid/hid-input.c‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,6 +1154,7 @@ static void report_features(struct hid_device *hid)
11541154

11551155
int hidinput_connect(struct hid_device *hid, unsigned int force)
11561156
{
1157+
struct hid_driver *drv = hid->driver;
11571158
struct hid_report *report;
11581159
struct hid_input *hidinput = NULL;
11591160
struct input_dev *input_dev;
@@ -1228,15 +1229,21 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
12281229
* UGCI) cram a lot of unrelated inputs into the
12291230
* same interface. */
12301231
hidinput->report = report;
1232+
if (drv->input_configured)
1233+
drv->input_configured(hid, hidinput);
12311234
if (input_register_device(hidinput->input))
12321235
goto out_cleanup;
12331236
hidinput = NULL;
12341237
}
12351238
}
12361239
}
12371240

1238-
if (hidinput && input_register_device(hidinput->input))
1239-
goto out_cleanup;
1241+
if (hidinput) {
1242+
if (drv->input_configured)
1243+
drv->input_configured(hid, hidinput);
1244+
if (input_register_device(hidinput->input))
1245+
goto out_cleanup;
1246+
}
12401247

12411248
return 0;
12421249

‎drivers/hid/hid-magicmouse.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd
392392

393393
__set_bit(EV_ABS, input->evbit);
394394

395-
error = input_mt_init_slots(input, 16);
395+
error = input_mt_init_slots(input, 16, 0);
396396
if (error)
397397
return error;
398398
input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 255 << 2,

0 commit comments

Comments
 (0)