1 files changed, 11 insertions, 7 deletions

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index a1b126f90261..4aff1d8dbc4f 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -828,6 +828,7 @@ static void dwc3_set_incr_burst_type(struct dwc3 *dwc)
         ret = device_property_read_u32_array(dev,
                         "snps,incr-burst-type-adjustment", vals, ntype);
         if (ret) {
+                kfree(vals);
                 dev_err(dev, "Error to get property\n");
                 return;
         }
@@ -846,6 +847,8 @@ static void dwc3_set_incr_burst_type(struct dwc3 *dwc)
                 incrx_mode = INCRX_BURST_MODE;
         }
 
+        kfree(vals);
+
         /* Enable Undefined Length INCR Burst and Enable INCRx Burst */
         cfg &= ~DWC3_GSBUSCFG0_INCRBRST_MASK;
         if (incrx_mode)
@@ -893,12 +896,6 @@ static int dwc3_core_init(struct dwc3 *dwc)
         u32                     reg;
         int                     ret;
 
-        if (!dwc3_core_is_valid(dwc)) {
-                dev_err(dwc->dev, "this is not a DesignWare USB3 DRD Core\n");
-                ret = -ENODEV;
-                goto err0;
-        }
-
         /*
          * Write Linux Version Code to our GUID register so it's easy to figure
          * out which kernel version a bug was found.
@@ -1218,7 +1215,7 @@ static void dwc3_get_properties(struct dwc3 *dwc)
         u8                      tx_max_burst_prd;
 
         /* default to highest possible threshold */
-        lpm_nyet_threshold = 0xff;
+        lpm_nyet_threshold = 0xf;
 
         /* default to -3.5dB de-emphasis */
         tx_de_emphasis = 1;
@@ -1426,6 +1423,11 @@ static int dwc3_probe(struct platform_device *pdev)
         dwc->regs       = regs;
         dwc->regs_size  = resource_size(&dwc_res);
 
+        if (!dwc3_core_is_valid(dwc)) {
+                dev_err(dwc->dev, "this is not a DesignWare USB3 DRD Core\n");
+                return -ENODEV;
+        }
+
         dwc3_get_properties(dwc);
 
         dwc->reset = devm_reset_control_get_optional_shared(dev, NULL);
@@ -1600,6 +1602,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
                 spin_lock_irqsave(&dwc->lock, flags);
                 dwc3_gadget_suspend(dwc);
                 spin_unlock_irqrestore(&dwc->lock, flags);
+                synchronize_irq(dwc->irq_gadget);
                 dwc3_core_exit(dwc);
                 break;
         case DWC3_GCTL_PRTCAP_HOST:
@@ -1632,6 +1635,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
                         spin_lock_irqsave(&dwc->lock, flags);
                         dwc3_gadget_suspend(dwc);
                         spin_unlock_irqrestore(&dwc->lock, flags);
+                        synchronize_irq(dwc->irq_gadget);
                 }
 
                 dwc3_otg_exit(dwc);