summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-05-27 11:04:42 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-05-27 11:04:42 +1000
commit9a8ca98ac98b235d8b0b6e6b2989ed1e2e5310b3 (patch)
tree9709bda55c9467b53b66724837a4569cd2c2c9bc /drivers
parent0215fc822d5dd1c9ae60143fb2803f6f64cf0bb6 (diff)
parent83efb8fe671af3c7b5613868aadc93ce973b6c3d (diff)
Merge remote branch 'hid/for-next'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/hidraw.c2
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,
{
struct hidraw_list *list = file->private_data;
int ret = 0, len;
- char *report;
DECLARE_WAITQUEUE(wait, current);
mutex_lock(&list->read_mutex);
@@ -84,7 +83,6 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count,
if (ret)
goto out;
- report = list->buffer[list->tail].value;
len = list->buffer[list->tail].len > count ?
count : list->buffer[list->tail].len;