aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-23 14:44:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-23 14:44:25 -0800
commit57949e8006de9643ac95447143e0211be3ff5f81 (patch)
tree2005f08ad1abcdc7268b93815e763017cfd25962 /drivers/input/serio
parent13d1ea9a20ed7d77f98c1622dcf9f3881649f6d7 (diff)
parent1d64b655dc083df5c5ac39945ccbbc6532903bf1 (diff)
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/serio')
-rw-r--r--drivers/input/serio/serio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 7c38d1fbabf..ba70058e2be 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -299,7 +299,7 @@ static int serio_queue_event(void *object, struct module *owner,
event->owner = owner;
list_add_tail(&event->node, &serio_event_list);
- schedule_work(&serio_event_work);
+ queue_work(system_long_wq, &serio_event_work);
out:
spin_unlock_irqrestore(&serio_event_lock, flags);