summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-10-12 11:30:03 +0200
committerJiri Kosina <jkosina@suse.cz>2009-10-12 11:30:03 +0200
commit61da09b5f01fb26d96f8915a3df39d120a281e81 (patch)
tree9f4153429bf4d3027bb925395d604ee05309818f /drivers/hid
parent9a5a01da98c5f71447fbb57cff54085bc45ef5a1 (diff)
parentb0e14951ee0f6c29abc64b92ec7075a159ede37c (diff)
Merge branch 'upstream-fixes' into for-next
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hidraw.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 0c6639ea03dd..b079a9c59958 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -47,10 +47,9 @@ static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count,
char *report;
DECLARE_WAITQUEUE(wait, current);
- while (ret == 0) {
-
- mutex_lock(&list->read_mutex);
+ mutex_lock(&list->read_mutex);
+ while (ret == 0) {
if (list->head == list->tail) {
add_wait_queue(&list->hidraw->wait, &wait);
set_current_state(TASK_INTERRUPTIBLE);