diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-13 10:10:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-13 10:10:33 -0700 |
commit | 03266d28ca5bf1959ee91dc6554c01b790975352 (patch) | |
tree | f98e36f3d3108344a82e9ccdb30790121ed93b5e /drivers/hid/hid-core.c | |
parent | ae445b9134126314844ad9e84010bae5e6684103 (diff) | |
parent | b0e14951ee0f6c29abc64b92ec7075a159ede37c (diff) | |
download | op-kernel-dev-03266d28ca5bf1959ee91dc6554c01b790975352.zip op-kernel-dev-03266d28ca5bf1959ee91dc6554c01b790975352.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: fix possible deadlock in hidraw_read
HID: fix kerneldoc comment for hid_input_report()
HID: add __init/__exit macros to twinhan.c
Diffstat (limited to 'drivers/hid/hid-core.c')
-rw-r--r-- | drivers/hid/hid-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index be34d32..7d05c4b 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1066,7 +1066,7 @@ EXPORT_SYMBOL_GPL(hid_report_raw_event); * @type: HID report type (HID_*_REPORT) * @data: report contents * @size: size of data parameter - * @interrupt: called from atomic? + * @interrupt: distinguish between interrupt and control transfers * * This is data entry for lower layers. */ |