summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-10-27 10:34:59 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2020-10-27 10:42:13 +0100
commit8ac84eedb283788584b90f07a1026377fa6a24fa (patch)
tree0c6760bdbd4cb77643b2d9dbb8481b35fdee57d2 /drivers
parent3ef10c4e7e719c8c4096a745578136be725134cd (diff)
downloadbarebox-8ac84eedb283788584b90f07a1026377fa6a24fa.tar.gz
barebox-8ac84eedb283788584b90f07a1026377fa6a24fa.tar.xz
usb: Fix initial max packet size
In case the USB device is a full speed device we have to set dev->epmaxpacketin[0] and dev->epmaxpacketout[0] before doing a get_descriptor_len() because otherwise it's unset during that call. Fixes: 6d1d95a386 ("usb: factor out a usb_setup_descriptor() function") Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/core/usb.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index c068c64c6b..ea244d4bcf 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -332,6 +332,8 @@ static int usb_setup_descriptor(struct usb_device *dev, bool do_read)
dev->descriptor->bMaxPacketSize0 = 64;
dev->maxpacketsize = PACKET_SIZE_64;
}
+ dev->epmaxpacketin[0] = dev->descriptor->bMaxPacketSize0;
+ dev->epmaxpacketout[0] = dev->descriptor->bMaxPacketSize0;
if (do_read && dev->speed == USB_SPEED_FULL) {
int err;
@@ -355,10 +357,10 @@ static int usb_setup_descriptor(struct usb_device *dev, bool do_read)
err = get_descriptor_len(dev, 64, 8);
if (err)
return err;
- }
- dev->epmaxpacketin[0] = dev->descriptor->bMaxPacketSize0;
- dev->epmaxpacketout[0] = dev->descriptor->bMaxPacketSize0;
+ dev->epmaxpacketin[0] = dev->descriptor->bMaxPacketSize0;
+ dev->epmaxpacketout[0] = dev->descriptor->bMaxPacketSize0;
+ }
switch (dev->descriptor->bMaxPacketSize0) {
case 8: