---

yaml --- r: 289649 b: refs/heads/master c: 85b4b3c h: refs/heads/master i: 289647: 7298887 v: v3
git-mirror · Mar 3, 2012 · 4fcc9a3 · 4fcc9a3
1 parent 1ed7b21
commit 4fcc9a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60b9bd8d162174edd335c1b83dbc2bafde1e9d5f
+refs/heads/master: 85b4b3c8c189e0159101f7628a71411af072ff69
diff --git a/trunk/drivers/usb/gadget/inode.c b/trunk/drivers/usb/gadget/inode.c
@@ -1043,6 +1043,8 @@ ep0_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr)
 // FIXME don't call this with the spinlock held ...
 				if (copy_to_user (buf, dev->req->buf, len))
 					retval = -EFAULT;
+				else
+					retval = len;
 				clean_req (dev->gadget->ep0, dev->req);
 				/* NOTE userspace can't yet choose to stall */
 			}