Merge tag 'u-boot-dfu-next-20251001' of https://source.denx.de/u-boot/custodians/u-boot-dfu into next

u-boot-dfu-next-20251001

CI:
- https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/27791

Fastboot:
- Fix has-slot command when using nand back-end.

USB gadget:
- Add missing null checks to atmel, dwc2 drivers (smatch)
- Remove redundant check in dwc3 gadget (smatch)
This commit is contained in:
Tom Rini
2025-10-02 11:20:01 -06:00
4 changed files with 9 additions and 7 deletions
+6 -1
View File
@@ -157,8 +157,13 @@ int fastboot_nand_get_part_info(const char *part_name,
struct part_info **part_info, char *response)
{
struct mtd_info *mtd = NULL;
int ret;
return fb_nand_lookup(part_name, &mtd, part_info, response);
ret = fb_nand_lookup(part_name, &mtd, part_info, response);
if (ret)
return -ENOENT;
return ret;
}
/**
+1 -4
View File
@@ -799,10 +799,7 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
status = DWC3_TRB_SIZE_TRBSTS(trb->size);
if (status == DWC3_TRBSTS_SETUP_PENDING) {
dev_dbg(dwc->dev, "Setup Pending received");
if (r)
dwc3_gadget_giveback(ep0, r, -ECONNRESET);
dwc3_gadget_giveback(ep0, r, -ECONNRESET);
return;
}
+1 -1
View File
@@ -1147,7 +1147,7 @@ static int usba_udc_irq(struct usba_udc *udc)
reset_all_endpoints(udc);
if (udc->gadget.speed != USB_SPEED_UNKNOWN &&
udc->driver->disconnect) {
udc->driver && udc->driver->disconnect) {
udc->gadget.speed = USB_SPEED_UNKNOWN;
spin_unlock(&udc->lock);
udc->driver->disconnect(&udc->gadget);
+1 -1
View File
@@ -526,7 +526,7 @@ static int dwc2_udc_irq(int irq, void *_dev)
if (gotgint & GOTGINT_SES_END_DET) {
debug_cond(DEBUG_ISR, "\t\tSession End Detected\n");
/* Let gadget detect disconnected state */
if (dev->driver->disconnect) {
if (dev->driver && dev->driver->disconnect) {
spin_unlock_irqrestore(&dev->lock, flags);
dev->driver->disconnect(&dev->gadget);
spin_lock_irqsave(&dev->lock, flags);