diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:23:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:23:49 -0400 |
commit | 5cf65713f87775c548e3eb48dbafa32e12f28000 (patch) | |
tree | 117442e28cddebb79246b1c4b871428e50b27fb1 /drivers/hid/hidraw.c | |
parent | b7c8e55db7141dcbb9d5305a3260fa0ed62a1bcc (diff) | |
parent | 9f17d516416c88dfe18f4deee508fce763ddedb5 (diff) |
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: (30 commits)
Revert "HID: add support for the Wacom Intuos 4 wireless"
HID: fix up Kconfig entry for ACRUX driver
HID: add ACRUX game controller force feedback support
HID: Force input registration for "VEC footpedal"
HID: add HID_QUIRK_HIDINPUT_FORCE
HID: hid-input.c: indentation fixes
HID: hiddev: use usb_find_interface, get rid of BKL
HID: ignore digitizer usage Undefined (0x00)
HID: Add support for Conceptronic CLLRCMCE
HID: hid-ids.h: Whitespace fixup, align using TABs
HID: picolcd: implement refcounting of framebuffer
HID: picolcd: do not reallocate memory on depth change
HID: picolcd: Add minimal palette required by fbcon on 8bpp
HID: magicmouse: Correct parsing of large X and Y motions.
HID: magicmouse: report last touch up
HID: picolcd: fix deferred_io init/cleanup to fb ordering
HID: hid-ids.h: keep vendor ids in alphabetical order
HID: add proper support for Elecom BM084 bluetooth mouse
HID: magicmouse: enable horizontal scrolling
HID: magicmouse: add param for scroll speed
...
Diffstat (limited to 'drivers/hid/hidraw.c')
-rw-r--r-- | drivers/hid/hidraw.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index 3ccd47850677..47d70c523d93 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c | |||
@@ -46,7 +46,6 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count, | |||
46 | { | 46 | { |
47 | struct hidraw_list *list = file->private_data; | 47 | struct hidraw_list *list = file->private_data; |
48 | int ret = 0, len; | 48 | int ret = 0, len; |
49 | char *report; | ||
50 | DECLARE_WAITQUEUE(wait, current); | 49 | DECLARE_WAITQUEUE(wait, current); |
51 | 50 | ||
52 | mutex_lock(&list->read_mutex); | 51 | mutex_lock(&list->read_mutex); |
@@ -84,7 +83,6 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count, | |||
84 | if (ret) | 83 | if (ret) |
85 | goto out; | 84 | goto out; |
86 | 85 | ||
87 | report = list->buffer[list->tail].value; | ||
88 | len = list->buffer[list->tail].len > count ? | 86 | len = list->buffer[list->tail].len > count ? |
89 | count : list->buffer[list->tail].len; | 87 | count : list->buffer[list->tail].len; |
90 | 88 | ||