summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-04 06:56:23 -0500
committerTom Rini <trini@konsulko.com>2016-02-04 06:56:23 -0500
commit94985cc9d3d7ed991ca8b2627d5894df5ea68f49 (patch)
tree2f0834c84191bd97f75c31a3aba8fd017dc85ed0
parent2a5bcaf3f8ace7398d4391701314d6e0457aec60 (diff)
parent8c9b4d5598e014036d2f2637c17bd6e3748ff6a3 (diff)
downloadblackbird-obmc-uboot-94985cc9d3d7ed991ca8b2627d5894df5ea68f49.tar.gz
blackbird-obmc-uboot-94985cc9d3d7ed991ca8b2627d5894df5ea68f49.zip
Merge branch 'master' of git://git.denx.de/u-boot-usb
-rw-r--r--drivers/usb/gadget/dwc2_udc_otg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c
index ffe2952f56..cb20b00a56 100644
--- a/drivers/usb/gadget/dwc2_udc_otg.c
+++ b/drivers/usb/gadget/dwc2_udc_otg.c
@@ -557,8 +557,8 @@ static int dwc2_ep_enable(struct usb_ep *_ep,
}
/* hardware _could_ do smaller, but driver doesn't */
- if ((desc->bmAttributes == USB_ENDPOINT_XFER_BULK
- && le16_to_cpu(get_unaligned(&desc->wMaxPacketSize)) !=
+ if ((desc->bmAttributes == USB_ENDPOINT_XFER_BULK &&
+ le16_to_cpu(get_unaligned(&desc->wMaxPacketSize)) >
ep_maxpacket(ep)) || !get_unaligned(&desc->wMaxPacketSize)) {
debug("%s: bad %s maxpacket\n", __func__, _ep->name);
OpenPOWER on IntegriCloud