From 8ac84eedb283788584b90f07a1026377fa6a24fa Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 27 Oct 2020 10:34:59 +0100 Subject: 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 --- drivers/usb/core/usb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'drivers') 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: -- cgit v1.2.3