diff options
| author | Tom Rini <[email protected]> | 2022-01-08 20:26:19 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-01-08 20:26:19 -0500 |
| commit | 6ef836accea026a5f87145f890ee47748bc8bfac (patch) | |
| tree | 1e0deb990df68e64b620c45ce954ba15e8966f98 /drivers | |
| parent | 47de135994b59f5787cba233f0102ab97a4e5726 (diff) | |
| parent | b05cebb5f244f2891b40397ce2eb0f4596fec659 (diff) | |
Merge branch '2022-01-08-further-important-updates'
- Further udoo_neo fixes, nitrogen6x mmc pinctrl fix
- dwc2_udc_otg fix
- Make imx8mq be consistent with yesterdays imx8 fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/dwc2_udc_otg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index 2f318144421..fb10884755b 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -655,6 +655,7 @@ static int dwc2_ep_enable(struct usb_ep *_ep, return -ESHUTDOWN; } + _ep->desc = desc; ep->stopped = 0; ep->desc = desc; ep->pio_irqs = 0; @@ -695,6 +696,7 @@ static int dwc2_ep_disable(struct usb_ep *_ep) /* Nuke all pending requests */ nuke(ep, -ESHUTDOWN); + _ep->desc = NULL; ep->desc = 0; ep->stopped = 1; |