Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"A fix for a crash in uinput, and a fix for build errors when HID-RMI
is built-in but SERIO is a module"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics-rmi4 - select 'SERIO' when needed
Input: uinput - fix crash when mixing old and new init style
+21
-7
+14
-6
drivers/input/misc/uinput.c
+14
-6
drivers/input/misc/uinput.c
···
263
263
return -EINVAL;
264
264
}
265
265
266
-
if (test_bit(ABS_MT_SLOT, dev->absbit)) {
267
-
nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1;
268
-
error = input_mt_init_slots(dev, nslot, 0);
269
-
if (error)
266
+
if (test_bit(EV_ABS, dev->evbit)) {
267
+
input_alloc_absinfo(dev);
268
+
if (!dev->absinfo) {
269
+
error = -EINVAL;
270
270
goto fail1;
271
-
} else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
272
-
input_set_events_per_packet(dev, 60);
271
+
}
272
+
273
+
if (test_bit(ABS_MT_SLOT, dev->absbit)) {
274
+
nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1;
275
+
error = input_mt_init_slots(dev, nslot, 0);
276
+
if (error)
277
+
goto fail1;
278
+
} else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {
279
+
input_set_events_per_packet(dev, 60);
280
+
}
273
281
}
274
282
275
283
if (test_bit(EV_FF, dev->evbit) && !udev->ff_effects_max) {
+7
-1
drivers/input/rmi4/Kconfig
+7
-1
drivers/input/rmi4/Kconfig
···
42
42
config RMI4_F03
43
43
bool "RMI4 Function 03 (PS2 Guest)"
44
44
depends on RMI4_CORE
45
-
depends on SERIO=y || RMI4_CORE=SERIO
46
45
help
47
46
Say Y here if you want to add support for RMI4 function 03.
48
47
49
48
Function 03 provides PS2 guest support for RMI4 devices. This
50
49
includes support for TrackPoints on TouchPads.
50
+
51
+
config RMI4_F03_SERIO
52
+
tristate
53
+
depends on RMI4_CORE
54
+
depends on RMI4_F03
55
+
default RMI4_CORE
56
+
select SERIO
51
57
52
58
config RMI4_2D_SENSOR
53
59
bool