---

yaml --- r: 316067 b: refs/heads/master c: 1f9dec1 h: refs/heads/master i: 316065: 51d7532 316063: 76f65ef v: v3
git-mirror · Jun 18, 2012 · 4c573bf · 4c573bf
1 parent c8a43a1
commit 4c573bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ace3d8614ab0e6544f5f85921085b55b915fe9aa
+refs/heads/master: 1f9dec1e0164b48da9b268a02197f38caa69b118
diff --git a/trunk/drivers/hid/uhid.c b/trunk/drivers/hid/uhid.c
@@ -117,6 +117,13 @@ static ssize_t uhid_char_write(struct file *file, const char __user *buffer,
 
 static unsigned int uhid_char_poll(struct file *file, poll_table *wait)
 {
+	struct uhid_device *uhid = file->private_data;
+
+	poll_wait(file, &uhid->waitq, wait);
+
+	if (uhid->head != uhid->tail)
+		return POLLIN | POLLRDNORM;
+
 	return 0;
 }