Input updates for 2.6.26-rc8
Dmitry Torokhov
maintainerHi Linus,
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus
or
master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git for-linus
to receive updates for the input subsystem. You will get a new keycode definition and changes to force-feedback core locking that bring it in sync with the recent locking changes in the input core. While these locking changes have not been exposed in 'next' I feel they should make into 2.6.26, because right now FF is simply broken - input_event takes a spinlock and then calls input_ff_event that tries to take a mutex.
Changelog:
---------
Bastien Nocera (1):
Input: add KEY_MEDIA_REPEAT definition
Dmitry Torokhov (1):
Input: fix locking in force-feedback core
Diffstat:
--------
drivers/input/ff-core.c | 17 +++++++++++------ include/linux/input.h | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-)
drivers/input/ff-core.c +11 -6
@@ -166,8 +166,10 @@ int input_ff_upload(struct input_dev *dev, struct ff_effect *effect,if (ret) goto out; +spin_lock_irq (&dev->event_lock); ff->effects[id] = *effect; ff->effect_owners[id] = file; +spin_unlock_irq (&dev->event_lock); out:mutex_unlock (&ff->mutex);
@@ -189,16 +191,22 @@ static int erase_effect(struct input_dev *dev, int effect_id,if (error)return error; +spin_lock_irq (&dev->event_lock); ff->playback (dev, effect_id,0 ); + ff->effect_owners[effect_id] =NULL ; +spin_unlock_irq (&dev->event_lock);if (ff->erase) { error = ff->erase (dev, effect_id); -if (error) +if (error) { +spin_lock_irq (&dev->event_lock); + ff->effect_owners[effect_id] = file; +spin_unlock_irq (&dev->event_lock); +return error; + } } - ff->effect_owners[effect_id] =NULL ; -return 0 ; }
@@ -263,8 +271,6 @@ int input_ff_event(struct input_dev *dev, unsigned int type,if (type !=EV_FF )return 0 ; -mutex_lock (&ff->mutex); -switch (code) {case FF_GAIN :if (!test_bit (FF_GAIN , dev->ffbit) || value >0xffff )
@@ -286,7 +292,6 @@ int input_ff_event(struct input_dev *dev, unsigned int type,break ; } -mutex_unlock (&ff->mutex);return 0 ; }EXPORT_SYMBOL_GPL (input_ff_event);
include/linux/input.h +1 -1
@@ -534,8 +534,8 @@ struct input_absinfo {#define KEY_FRAMEBACK 0x1b4/* Consumer - transport controls */ #define KEY_FRAMEFORWARD 0x1b5 -#define KEY_CONTEXT_MENU 0x1b6/* GenDesc - system context menu */ +#define KEY_MEDIA_REPEAT 0x1b7/* Consumer - transport control */ #define KEY_DEL_EOL 0x1c0#define KEY_DEL_EOS 0x1c1
Signature · 1 line
Dmitry