diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-27 20:38:06 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-27 20:38:06 +0400 |
| commit | ff0c57ac70434bc936cb0110eaf033a0a1a62e52 (patch) | |
| tree | 8a055fa5690a01b35ab7294e699114821a5f671c /drivers/hid/hid-logitech-dj.h | |
| parent | 1fb00cbca05ba13f386e75aa1f6d801895cfed29 (diff) | |
| parent | 844817e47eef14141cf59b8d5ac08dd11c0a9189 (diff) | |
| download | linux-ff0c57ac70434bc936cb0110eaf033a0a1a62e52.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- fixes for potential memory corruption problems in magicmouse and
picolcd drivers (the HW would have to be manufactured to be
deliberately evil to trigger those) which were found by Steven
Vittitoe
- fix for false error message appearing in dmesg from logitech-dj
driver, from Benjamin Tissoires
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: picolcd: sanity check report size in raw_event() callback
HID: magicmouse: sanity check report size in raw_event() callback
HID: logitech-dj: prevent false errors to be shown
Diffstat (limited to 'drivers/hid/hid-logitech-dj.h')
| -rw-r--r-- | drivers/hid/hid-logitech-dj.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-logitech-dj.h b/drivers/hid/hid-logitech-dj.h index 4a4000340ce1..daeb0aa4bee9 100644 --- a/drivers/hid/hid-logitech-dj.h +++ b/drivers/hid/hid-logitech-dj.h @@ -27,6 +27,7 @@ #define DJ_MAX_PAIRED_DEVICES 6 #define DJ_MAX_NUMBER_NOTIFICATIONS 8 +#define DJ_RECEIVER_INDEX 0 #define DJ_DEVICE_INDEX_MIN 1 #define DJ_DEVICE_INDEX_MAX 6 |