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

Commit b09c412a 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 subsystem fixes from Dmitry Torokhov:
 "Simply small driver fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ads7846 - remove redundant regulator_disable call
  Input: synaptics-rmi4 - fix register descriptor subpacket map construction
  Input: tegra-kbc - fix inverted reset logic
  Input: silead - use devm_gpiod_get
  Input: i8042 - set up shared ps2_cmd_mutex for AUX ports
parents 219c04ce e3a888a4

drivers/input/keyboard/tegra-kbc.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static int tegra_kbc_start(struct tegra_kbc *kbc) 
	/* Reset the KBC controller to clear all previous status.*/

	reset_control_assert(kbc->rst);

	udelay(100);

	reset_control_assert(kbc->rst);

	reset_control_deassert(kbc->rst);

	udelay(100);



	tegra_kbc_config_pins(kbc);

drivers/input/rmi4/rmi_driver.c

+2 −1
Original line number Diff line number Diff line
@@ -553,7 +553,6 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr, 
		goto free_struct_buff;



	reg = find_first_bit(rdesc->presense_map, RMI_REG_DESC_PRESENSE_BITS);

	map_offset = 0;

	for (i = 0; i < rdesc->num_registers; i++) {

		struct rmi_register_desc_item *item = &rdesc->registers[i];

		int reg_size = struct_buf[offset];
@@ -576,6 +575,8 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr, 
		item->reg = reg;

		item->reg_size = reg_size;



		map_offset = 0;



		do {

			for (b = 0; b < 7; b++) {

				if (struct_buf[offset] & (0x1 << b))

drivers/input/serio/i8042.c

+1 −0
Original line number Diff line number Diff line
@@ -1305,6 +1305,7 @@ static int __init i8042_create_aux_port(int idx) 
	serio->write		= i8042_aux_write;

	serio->start		= i8042_start;

	serio->stop		= i8042_stop;

	serio->ps2_cmd_mutex	= &i8042_mutex;

	serio->port_data	= port;

	serio->dev.parent	= &i8042_platform_device->dev;

	if (idx < 0) {

drivers/input/touchscreen/ads7846.c

+0 −1
Original line number Diff line number Diff line
@@ -1473,7 +1473,6 @@ static int ads7846_remove(struct spi_device *spi) 


	ads784x_hwmon_unregister(spi, ts);



	regulator_disable(ts->reg);

	regulator_put(ts->reg);



	if (!ts->get_pendown_state) {

drivers/input/touchscreen/silead.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static int silead_ts_probe(struct i2c_client *client, 
		return -ENODEV;



	/* Power GPIO pin */

	data->gpio_power = gpiod_get_optional(dev, "power", GPIOD_OUT_LOW);

	data->gpio_power = devm_gpiod_get_optional(dev, "power", GPIOD_OUT_LOW);

	if (IS_ERR(data->gpio_power)) {

		if (PTR_ERR(data->gpio_power) != -EPROBE_DEFER)

			dev_err(dev, "Shutdown GPIO request failed\n");