Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: - tweaks to Elan drivers (both PS/2 and I2C) to support new devices. Also revert of one of IDs as that device should really be driven by i2c-hid + hid-multitouch - a few drivers have been switched to set_brightness_blocking() call because they either were sleeping the their set_brightness() implementation or used workqueue but were not canceling it on unbind. - ps2-gpio and matrix_keypad needed to [properly] flush their works to avoid potential use-after-free on unbind. - other miscellaneous fixes. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: elan_i2c - add ACPI ID for touchpad in Lenovo V330-15ISK Input: st-keyscan - fix potential zalloc NULL dereference Input: apanel - switch to using brightness_set_blocking() Revert "Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G" Input: qt2160 - switch to using brightness_set_blocking() Input: matrix_keypad - use flush_delayed_work() Input: ps2-gpio - flush TX work when closing port Input: cap11xx - switch to using set_brightness_blocking() Input: elantech - enable 3rd button support on Fujitsu CELSIUS H780 Input: bma150 - register input device after setting private data Input: pwm-vibra - stop regulator after disabling pwm, not before Input: pwm-vibra - prevent unbalanced regulator Input: snvs_pwrkey - allow selecting driver for i.MX 7D
Showing
- drivers/input/keyboard/Kconfig 1 addition, 1 deletiondrivers/input/keyboard/Kconfig
- drivers/input/keyboard/cap11xx.c 11 additions, 24 deletionsdrivers/input/keyboard/cap11xx.c
- drivers/input/keyboard/matrix_keypad.c 1 addition, 1 deletiondrivers/input/keyboard/matrix_keypad.c
- drivers/input/keyboard/qt2160.c 27 additions, 42 deletionsdrivers/input/keyboard/qt2160.c
- drivers/input/keyboard/st-keyscan.c 2 additions, 2 deletionsdrivers/input/keyboard/st-keyscan.c
- drivers/input/misc/apanel.c 4 additions, 20 deletionsdrivers/input/misc/apanel.c
- drivers/input/misc/bma150.c 5 additions, 4 deletionsdrivers/input/misc/bma150.c
- drivers/input/misc/pwm-vibra.c 13 additions, 6 deletionsdrivers/input/misc/pwm-vibra.c
- drivers/input/mouse/elan_i2c_core.c 1 addition, 1 deletiondrivers/input/mouse/elan_i2c_core.c
- drivers/input/mouse/elantech.c 9 additions, 0 deletionsdrivers/input/mouse/elantech.c
- drivers/input/serio/ps2-gpio.c 1 addition, 0 deletionsdrivers/input/serio/ps2-gpio.c
Loading
Please register or sign in to comment