diff options
| author | Tom Rini <trini@konsulko.com> | 2023-04-03 20:49:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-04-03 20:49:03 -0400 |
| commit | 02f8486b9f9fd27c1ad7fdda78c3c892431285a9 (patch) | |
| tree | 7108d69e75bbaf9d1e2f89ee981c20a6be3d77e1 | |
| parent | 8ca42025952afba977ce6cecf644371e3f7fa11d (diff) | |
| parent | 7f2347088529693ee13b4ab7e7a27f5a1f617c1f (diff) | |
| download | u-boot-02f8486b9f9fd27c1ad7fdda78c3c892431285a9.zip u-boot-02f8486b9f9fd27c1ad7fdda78c3c892431285a9.tar.gz u-boot-02f8486b9f9fd27c1ad7fdda78c3c892431285a9.tar.bz2 | |
Merge https://source.denx.de/u-boot/custodians/u-boot-usb
- Two USB gadget fixes
| -rw-r--r-- | drivers/usb/gadget/composite.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_sdp.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 2a309e6..04b8541 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1068,7 +1068,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) if (!gadget_is_dualspeed(gadget) || gadget->speed >= USB_SPEED_SUPER) break; - + fallthrough; case USB_DT_CONFIG: value = config_desc(cdev, w_value); if (value >= 0) diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index 9ea43f2..4da5a16 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -865,6 +865,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image, struct spl_image_info spl_image = {}; struct spl_boot_device bootdev = {}; spl_parse_image_header(&spl_image, &bootdev, header); + spl_board_prepare_for_boot(); jump_to_image_no_args(&spl_image); #else /* In U-Boot, allow jumps to scripts */ |