4 files changed, 9 insertions, 3 deletions

diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 89abc6078703..556a876c7896 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -102,6 +102,7 @@ config USB_DWC3_MESON_G12A
        depends on ARCH_MESON || COMPILE_TEST
        default USB_DWC3
        select USB_ROLE_SWITCH
+        select REGMAP_MMIO
        help
          Support USB2/3 functionality in Amlogic G12A platforms.
          Say 'Y' or 'M' if you have one such device.
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 999ce5e84d3c..97d6ae3c4df2 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -312,8 +312,7 @@ static void dwc3_frame_length_adjustment(struct dwc3 *dwc)
 
         reg = dwc3_readl(dwc->regs, DWC3_GFLADJ);
         dft = reg & DWC3_GFLADJ_30MHZ_MASK;
-        if (!dev_WARN_ONCE(dwc->dev, dft == dwc->fladj,
-            "request value same as default, ignoring\n")) {
+        if (dft != dwc->fladj) {
                 reg &= ~DWC3_GFLADJ_30MHZ_MASK;
                 reg |= DWC3_GFLADJ_30MHZ_SDBND_SEL | dwc->fladj;
                 dwc3_writel(dwc->regs, DWC3_GFLADJ, reg);
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 5e8e18222f92..023f0357efd7 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -258,7 +258,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 
         ret = platform_device_add_properties(dwc->dwc3, p);
         if (ret < 0)
-                return ret;
+                goto err;
 
         ret = dwc3_pci_quirks(dwc);
         if (ret)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 86dc1db788a9..a9aba716bf80 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -707,6 +707,12 @@ static void dwc3_remove_requests(struct dwc3 *dwc, struct dwc3_ep *dep)
 
                 dwc3_gadget_giveback(dep, req, -ESHUTDOWN);
         }
+
+        while (!list_empty(&dep->cancelled_list)) {
+                req = next_request(&dep->cancelled_list);
+
+                dwc3_gadget_giveback(dep, req, -ESHUTDOWN);
+        }
 }
 
 /**