summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authorBob Liu <lliubbo@gmail.com>2011-06-23 17:09:49 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-01 14:44:58 -0700
commit5030ec730279eabafccf862f3c8393af90c258a5 (patch)
tree764b3555dbaf7157bd3e0313d4f8f138ab64d3a7 /drivers/usb/gadget
parent6e7be1a0a87da3c54f0036a1601a58ac0616b2bb (diff)
downloadlinux-3.10-5030ec730279eabafccf862f3c8393af90c258a5.tar.gz
linux-3.10-5030ec730279eabafccf862f3c8393af90c258a5.tar.bz2
linux-3.10-5030ec730279eabafccf862f3c8393af90c258a5.zip
USB: gadget: fix req length in sourcesink_setup()
The recent commit 2edb11cbac fixed req->length in the composite_setup() function, but that will cause all g_zero tests to fail like: root#> ./testusb -D /proc/bus/usb/002/021 -t14 -c 15000 -s 256 -v 1 unknown speed /proc/bus/usb/002/021 /proc/bus/usb/002/021 test 14 --> 32 (Broken pipe) We need to fix req->length in sourcesink_setup() as well to avoid this. Signed-off-by: Bob Liu <lliubbo@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/f_sourcesink.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_sourcesink.c b/drivers/usb/gadget/f_sourcesink.c
index caf2f95e034..5a92883f4c8 100644
--- a/drivers/usb/gadget/f_sourcesink.c
+++ b/drivers/usb/gadget/f_sourcesink.c
@@ -437,6 +437,8 @@ static int sourcesink_setup(struct usb_configuration *c,
u16 w_value = le16_to_cpu(ctrl->wValue);
u16 w_length = le16_to_cpu(ctrl->wLength);
+ req->length = USB_BUFSIZ;
+
/* composite driver infrastructure handles everything except
* the two control test requests.
*/