diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-17 21:20:19 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-10-17 21:20:19 -0700 |
| commit | 3136baf8d09458bb04332b81494fd13ad90fe94a (patch) | |
| tree | 6593ef5894597bf6224cf0374e4d49b1499d347d /drivers/input/misc | |
| parent | 1d02ad436235080b8a95a2c86a66cb7b8f2e9df9 (diff) | |
| parent | ca047fedd89bbb4b79b61e0656a7b799e4e45e6d (diff) | |
| download | linux-3136baf8d09458bb04332b81494fd13ad90fe94a.tar.gz linux-3136baf8d09458bb04332b81494fd13ad90fe94a.tar.bz2 linux-3136baf8d09458bb04332b81494fd13ad90fe94a.zip | |
Merge branch 'for-linus' into next
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/uinput.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index 0d4266a533a5..360698553eb5 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -404,6 +404,13 @@ static int uinput_setup_device(struct uinput_device *udev, const char __user *bu retval = uinput_validate_absbits(dev); if (retval < 0) goto exit; + if (test_bit(ABS_MT_SLOT, dev->absbit)) { + int nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1; + input_mt_create_slots(dev, nslot); + input_set_events_per_packet(dev, 6 * nslot); + } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) { + input_set_events_per_packet(dev, 60); + } } udev->state = UIST_SETUP_COMPLETE; |