Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: - fixes for two long standing issues (lock up and a crash) in force feedback handling in uinput driver - tweak to firmware update timing in Elan I2C touchpad driver. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: elan_i2c - extend Flash-Write delay Input: uinput - avoid crash when sending FF request to device going away Input: uinput - avoid FF flush when destroying device
Showing
- drivers/input/ff-core.c 10 additions, 3 deletionsdrivers/input/ff-core.c
- drivers/input/misc/uinput.c 39 additions, 18 deletionsdrivers/input/misc/uinput.c
- drivers/input/mouse/elan_i2c_i2c.c 1 addition, 1 deletiondrivers/input/mouse/elan_i2c_i2c.c
- include/linux/input.h 1 addition, 0 deletionsinclude/linux/input.h
Please register or sign in to comment