summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-14 13:00:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-14 13:00:17 -0800
commitcd4ca27d3dedfff09000586e4ae67771608696a0 (patch)
tree8ebf6b0b4b2e52585c4853d192c47d1866ec7ec6 /include
parent0e70613b1c26bf23909d0e778de52d0cc6d88835 (diff)
parent3d4c3aa938fcbfee1c7a6d66ee23288448fb97e7 (diff)
downloadlinux-cd4ca27d3dedfff09000586e4ae67771608696a0.tar.gz
linux-cd4ca27d3dedfff09000586e4ae67771608696a0.tar.bz2
linux-cd4ca27d3dedfff09000586e4ae67771608696a0.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: psmouse - remove unneeded '\n' from psmouse.proto parameter Input: atkbd - restore LED state at reconnect Input: force LED reset on resume Input: fix locking in memoryless force-feedback devices
Diffstat (limited to 'include')
-rw-r--r--include/linux/input.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index 0ccfc30cd40f..c2b1a7d244d9 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1377,6 +1377,10 @@ extern struct class input_class;
* methods; erase() is optional. set_gain() and set_autocenter() need
* only be implemented if driver sets up FF_GAIN and FF_AUTOCENTER
* bits.
+ *
+ * Note that playback(), set_gain() and set_autocenter() are called with
+ * dev->event_lock spinlock held and interrupts off and thus may not
+ * sleep.
*/
struct ff_device {
int (*upload)(struct input_dev *dev, struct ff_effect *effect,