---

yaml --- r: 248539 b: refs/heads/master c: 06268b2 h: refs/heads/master i: 248537: 3d1fe58 248535: 8daa35b v: v3
git-mirror · Apr 29, 2011 · f45c154 · f45c154
1 parent e6540a2
commit f45c154
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35dca5b4a67a93bbb75c2753d6dc432dc8f82e5d
+refs/heads/master: 06268b2a384ece73618c1ad7649d19905ab79806
diff --git a/trunk/drivers/hid/usbhid/hiddev.c b/trunk/drivers/hid/usbhid/hiddev.c
@@ -367,8 +367,10 @@ static ssize_t hiddev_read(struct file * file, char __user * buffer, size_t coun
 				/* let O_NONBLOCK tasks run */
 				mutex_unlock(&list->thread_lock);
 				schedule();
-				if (mutex_lock_interruptible(&list->thread_lock))
+				if (mutex_lock_interruptible(&list->thread_lock)) {
+					finish_wait(&list->hiddev->wait, &wait);
 					return -EINTR;
+				}
 				set_current_state(TASK_INTERRUPTIBLE);
 			}
 			finish_wait(&list->hiddev->wait, &wait);