git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-28 21:46:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-next' of git://github.com/rydberg/linux into next

Browse Source 
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.
This commit is contained in:
Dmitry Torokhov
2012-10-01 14:40:51 -07:00
parent fb4f552e89 51c80b7400
commit 7774036808
25 changed files with 890 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/misc/uinput.c
View File

@@ -416,7 +416,7 @@ static int uinput_setup_device(struct uinput_device *udev,
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);
}