Merge tag 'usb-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
 "Here are four small USB fixes for 5.2-rc6.

  They include two xhci bugfixes, a chipidea fix, and a small dwc2 fix.
  Nothing major, just nice things to get resolved for reported issues.

  All have been in linux-next with no reported issues"

* tag 'usb-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  xhci: detect USB 3.2 capable host controllers correctly
  usb: xhci: Don't try to recover an endpoint if port is in error state.
  usb: dwc2: Use generic PHY width in params setup
  usb: chipidea: udc: workaround for endpoint conflict issue

1 files changed, 20 insertions, 0 deletions

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 829e947cabf5..6a5ee8e6da10 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1622,6 +1622,25 @@ static int ci_udc_pullup(struct usb_gadget *_gadget, int is_on)
 static int ci_udc_start(struct usb_gadget *gadget,
                          struct usb_gadget_driver *driver);
 static int ci_udc_stop(struct usb_gadget *gadget);
+
+/* Match ISOC IN from the highest endpoint */
+static struct usb_ep *ci_udc_match_ep(struct usb_gadget *gadget,
+                              struct usb_endpoint_descriptor *desc,
+                              struct usb_ss_ep_comp_descriptor *comp_desc)
+{
+        struct ci_hdrc *ci = container_of(gadget, struct ci_hdrc, gadget);
+        struct usb_ep *ep;
+
+        if (usb_endpoint_xfer_isoc(desc) && usb_endpoint_dir_in(desc)) {
+                list_for_each_entry_reverse(ep, &ci->gadget.ep_list, ep_list) {
+                        if (ep->caps.dir_in && !ep->claimed)
+                                return ep;
+                }
+        }
+
+        return NULL;
+}
+
 /**
  * Device operations part of the API to the USB controller hardware,
  * which don't involve endpoints (or i/o)
@@ -1635,6 +1654,7 @@ static const struct usb_gadget_ops usb_gadget_ops = {
         .vbus_draw      = ci_udc_vbus_draw,
         .udc_start      = ci_udc_start,
         .udc_stop       = ci_udc_stop,
+        .match_ep       = ci_udc_match_ep,
 };
 
 static int init_eps(struct ci_hdrc *ci)