tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds b09c412a 219c04ce

+5 -4
+1 -1
drivers/input/keyboard/tegra-kbc.c
··· 376 376 /* Reset the KBC controller to clear all previous status.*/ 377 377 reset_control_assert(kbc->rst); 378 378 udelay(100); 379 - reset_control_assert(kbc->rst); 379 + reset_control_deassert(kbc->rst); 380 380 udelay(100); 381 381 382 382 tegra_kbc_config_pins(kbc);
+2 -1
drivers/input/rmi4/rmi_driver.c
··· 553 553 goto free_struct_buff; 554 554 555 555 reg = find_first_bit(rdesc->presense_map, RMI_REG_DESC_PRESENSE_BITS); 556 - map_offset = 0; 557 556 for (i = 0; i < rdesc->num_registers; i++) { 558 557 struct rmi_register_desc_item *item = &rdesc->registers[i]; 559 558 int reg_size = struct_buf[offset]; ··· 574 575 575 576 item->reg = reg; 576 577 item->reg_size = reg_size; 578 + 579 + map_offset = 0; 577 580 578 581 do { 579 582 for (b = 0; b < 7; b++) {
+1
drivers/input/serio/i8042.c
··· 1305 1305 serio->write = i8042_aux_write; 1306 1306 serio->start = i8042_start; 1307 1307 serio->stop = i8042_stop; 1308 + serio->ps2_cmd_mutex = &i8042_mutex; 1308 1309 serio->port_data = port; 1309 1310 serio->dev.parent = &i8042_platform_device->dev; 1310 1311 if (idx < 0) {
-1
drivers/input/touchscreen/ads7846.c
··· 1473 1473 1474 1474 ads784x_hwmon_unregister(spi, ts); 1475 1475 1476 - regulator_disable(ts->reg); 1477 1476 regulator_put(ts->reg); 1478 1477 1479 1478 if (!ts->get_pendown_state) {
+1 -1
drivers/input/touchscreen/silead.c
··· 464 464 return -ENODEV; 465 465 466 466 /* Power GPIO pin */ 467 - data->gpio_power = gpiod_get_optional(dev, "power", GPIOD_OUT_LOW); 467 + data->gpio_power = devm_gpiod_get_optional(dev, "power", GPIOD_OUT_LOW); 468 468 if (IS_ERR(data->gpio_power)) { 469 469 if (PTR_ERR(data->gpio_power) != -EPROBE_DEFER) 470 470 dev_err(dev, "Shutdown GPIO request failed\n");