Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (25cce03b) · Commits · 戴 / test

drivers/input/keyboard/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -420,7 +420,7 @@ config KEYBOARD_MPR121

		config KEYBOARD_SNVS_PWRKEY
		tristate "IMX SNVS Power Key Driver"
		depends on SOC_IMX6SX \|\| SOC_IMX7D
		depends on ARCH_MXC \|\| COMPILE_TEST
		depends on OF
		help
		This is the snvs powerkey driver for the Freescale i.MX application

+1 −5

Original line number	Diff line number	Diff line
		@@ -860,7 +860,7 @@ static int rmi_create_function(struct rmi_device *rmi_dev,

		error = rmi_register_function(fn);
		if (error)
		goto err_put_fn;
		return error;

		if (pdt->function_number == 0x01)
		data->f01_container = fn;
		@@ -870,10 +870,6 @@ static int rmi_create_function(struct rmi_device *rmi_dev,
		list_add_tail(&fn->node, &data->function_list);

		return RMI_SCAN_CONTINUE;

		err_put_fn:
		put_device(&fn->dev);
		return error;
		}

		void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake)

+1 −1

Original line number	Diff line number	Diff line
		@@ -1230,7 +1230,7 @@ static int rmi_f11_initialize(struct rmi_function *fn)
		}

		rc = f11_write_control_regs(fn, &f11->sens_query,
		&f11->dev_controls, fn->fd.query_base_addr);
		&f11->dev_controls, fn->fd.control_base_addr);
		if (rc)
		dev_warn(&fn->dev, "Failed to write control registers\n");