diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 15:14:50 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 15:14:50 +0900 |
| commit | abeaf33a4101764291ec79cf286e08c0966eb26e (patch) | |
| tree | bb3f8ae60d1ff0d99a907bcc223886f9d71fafea /drivers/hid/hidraw.c | |
| parent | 731ba3301de41d2ffae9dd3e0f85f7361d8ad8f4 (diff) | |
| parent | 52a94909f00e0ffceeac202e517a126d57c1c523 (diff) | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/mm/cache-sh4.c
Diffstat (limited to 'drivers/hid/hidraw.c')
| -rw-r--r-- | drivers/hid/hidraw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index ba05275e510..cdd136942bc 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c @@ -48,10 +48,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); |