Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25cce03b 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:
 "Just a couple of fixups for Synaptics RMI4 driver and allowing
  snvs_pwrkey to be selected on more boards"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics-rmi4 - write config register values to the right offset
  Input: synaptics-rmi4 - fix possible double free
  Input: snvs_pwrkey - make it depend on ARCH_MXC
parents 037904a2 3a349763

drivers/input/keyboard/Kconfig

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




config KEYBOARD_SNVS_PWRKEY

config KEYBOARD_SNVS_PWRKEY

	tristate "IMX SNVS Power Key Driver"

	tristate "IMX SNVS Power Key Driver"

	depends on SOC_IMX6SX || SOC_IMX7D

	depends on ARCH_MXC || COMPILE_TEST

	depends on OF

	depends on OF

	help

	help

	  This is the snvs powerkey driver for the Freescale i.MX application

	  This is the snvs powerkey driver for the Freescale i.MX application

drivers/input/rmi4/rmi_driver.c

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




	error = rmi_register_function(fn);

	error = rmi_register_function(fn);

	if (error)

	if (error)

		goto err_put_fn;

		return error;





	if (pdt->function_number == 0x01)

	if (pdt->function_number == 0x01)

		data->f01_container = fn;

		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);

	list_add_tail(&fn->node, &data->function_list);





	return RMI_SCAN_CONTINUE;

	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)

void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake)

drivers/input/rmi4/rmi_f11.c

+1 −1
Original line number Original line 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,

	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)

	if (rc)

		dev_warn(&fn->dev, "Failed to write control registers\n");

		dev_warn(&fn->dev, "Failed to write control registers\n");