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

Linus Torvalds 25cce03b 037904a2

+3 -7
+1 -1
drivers/input/keyboard/Kconfig
··· 420 420 421 421 config KEYBOARD_SNVS_PWRKEY 422 422 tristate "IMX SNVS Power Key Driver" 423 - depends on SOC_IMX6SX || SOC_IMX7D 423 + depends on ARCH_MXC || COMPILE_TEST 424 424 depends on OF 425 425 help 426 426 This is the snvs powerkey driver for the Freescale i.MX application
+1 -5
drivers/input/rmi4/rmi_driver.c
··· 860 860 861 861 error = rmi_register_function(fn); 862 862 if (error) 863 - goto err_put_fn; 863 + return error; 864 864 865 865 if (pdt->function_number == 0x01) 866 866 data->f01_container = fn; ··· 870 870 list_add_tail(&fn->node, &data->function_list); 871 871 872 872 return RMI_SCAN_CONTINUE; 873 - 874 - err_put_fn: 875 - put_device(&fn->dev); 876 - return error; 877 873 } 878 874 879 875 void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake)
+1 -1
drivers/input/rmi4/rmi_f11.c
··· 1230 1230 } 1231 1231 1232 1232 rc = f11_write_control_regs(fn, &f11->sens_query, 1233 - &f11->dev_controls, fn->fd.query_base_addr); 1233 + &f11->dev_controls, fn->fd.control_base_addr); 1234 1234 if (rc) 1235 1235 dev_warn(&fn->dev, "Failed to write control registers\n"); 1236 1236