Commit 99378fd2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 189addce 413d3732

drivers/input/misc/uinput.c

+14 −6
Original line number Diff line number Diff line
@@ -263,6 +263,13 @@ static int uinput_create_device(struct uinput_device *udev) 
		return -EINVAL;

	}



	if (test_bit(EV_ABS, dev->evbit)) {

		input_alloc_absinfo(dev);

		if (!dev->absinfo) {

			error = -EINVAL;

			goto fail1;

		}



		if (test_bit(ABS_MT_SLOT, dev->absbit)) {

			nslot = input_abs_get_max(dev, ABS_MT_SLOT) + 1;

			error = input_mt_init_slots(dev, nslot, 0);
@@ -271,6 +278,7 @@ static int uinput_create_device(struct uinput_device *udev) 
		} else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) {

			input_set_events_per_packet(dev, 60);

		}

	}



	if (test_bit(EV_FF, dev->evbit) && !udev->ff_effects_max) {

		printk(KERN_DEBUG "%s: ff_effects_max should be non-zero when FF_BIT is set\n",

drivers/input/rmi4/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -42,13 +42,19 @@ config RMI4_SMB 
config RMI4_F03

        bool "RMI4 Function 03 (PS2 Guest)"

	depends on RMI4_CORE

	depends on SERIO=y || RMI4_CORE=SERIO

        help

          Say Y here if you want to add support for RMI4 function 03.



          Function 03 provides PS2 guest support for RMI4 devices. This

          includes support for TrackPoints on TouchPads.



config RMI4_F03_SERIO

	tristate

	depends on RMI4_CORE

	depends on RMI4_F03

	default RMI4_CORE

	select SERIO



config RMI4_2D_SENSOR

	bool

	depends on RMI4_CORE

CRA Git | Maintained and supported by SUSTech CRA and CCSE