diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-09-19 21:47:29 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-09-19 21:48:16 (GMT) |
| commit | 1ad346a9f8ca0d266ddbfdbbbd8913782b417f35 (patch) | |
| tree | e7d1c7bb3af558c434b4545a4cff744f09a0f227 /drivers/input/misc | |
| parent | 5b6e7f1c169db10632459c28f148011e039187bd (diff) | |
| parent | 51c80b74002f86477d691ed7c8ac479dcfa6271c (diff) | |
| download | linux-fsl-qoriq-1ad346a9f8ca0d266ddbfdbbbd8913782b417f35.tar.xz | |
Merge branch 'for-next' of git://github.com/rydberg/linux into from-henrik
Pull Input and HID updates for 3.7 from Henrik Rydberg:
"The tree contains input core changes, Acked by Dmitry, which substantially
reduces the irqsoff latency for all input devices. It also contains MT changes
which allows further memory reduction, speedup and hardware support in the HID
Multitouch driver. Lastly, you get the conversion of the bcm5974 driver to
MT-B, which due to the mixed dependency of the tree fits better here than
anywhere else."
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/uinput.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index 7360568..6b17975 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -405,7 +405,7 @@ static int uinput_setup_device(struct uinput_device *udev, const char __user *bu goto exit; if (test_bit(ABS_MT_SLOT, dev->absbit)) { int nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1; - input_mt_init_slots(dev, nslot); + input_mt_init_slots(dev, nslot, 0); } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) { input_set_events_per_packet(dev, 60); } |