diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-23 14:44:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-23 14:44:25 -0800 |
commit | 57949e8006de9643ac95447143e0211be3ff5f81 (patch) | |
tree | 2005f08ad1abcdc7268b93815e763017cfd25962 /drivers/input/gameport | |
parent | 13d1ea9a20ed7d77f98c1622dcf9f3881649f6d7 (diff) | |
parent | 1d64b655dc083df5c5ac39945ccbbc6532903bf1 (diff) | |
download | linux-57949e8006de9643ac95447143e0211be3ff5f81.tar.gz linux-57949e8006de9643ac95447143e0211be3ff5f81.tar.bz2 linux-57949e8006de9643ac95447143e0211be3ff5f81.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: serio/gameport - use 'long' system workqueue
Input: synaptics - document 0x0c query
Input: tegra-kbc - add function keymap
Diffstat (limited to 'drivers/input/gameport')
-rw-r--r-- | drivers/input/gameport/gameport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c index 23cf8fc933ec..5b8f59d6c3e8 100644 --- a/drivers/input/gameport/gameport.c +++ b/drivers/input/gameport/gameport.c @@ -360,7 +360,7 @@ static int gameport_queue_event(void *object, struct module *owner, event->owner = owner; list_add_tail(&event->node, &gameport_event_list); - schedule_work(&gameport_event_work); + queue_work(system_long_wq, &gameport_event_work); out: spin_unlock_irqrestore(&gameport_event_lock, flags); |