From: Gregory Herrero <gregory.herr...@intel.com>

When disconnecting cable, controller will detect a suspend condition
and enter partial power down. If vbus_session is called by the phy
driver during hibernation, make sure controller exit hibernation
before it is accessed.

Signed-off-by: Jianqiang Tang <jianqiang.t...@intel.com>
Signed-off-by: Gregory Herrero <gregory.herr...@intel.com>
Signed-off-by: Mian Yousaf Kaukab <yousaf.kau...@intel.com>
Tested-by: Robert Baldyga <r.bald...@samsung.com>
---
 drivers/usb/dwc2/gadget.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 1f11b50..2bb85b0 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -3288,14 +3288,15 @@ static int dwc2_hsotg_vbus_session(struct usb_gadget 
*gadget, int is_active)
        dev_dbg(hsotg->dev, "%s: is_active: %d\n", __func__, is_active);
        spin_lock_irqsave(&hsotg->lock, flags);
 
+       /*
+        * If controller is hibernated, it must exit from hibernation
+        * before being initialized / de-initialized
+        */
+       if (hsotg->lx_state == DWC2_L2)
+               dwc2_exit_hibernation(hsotg, false);
+
        if (is_active) {
                hsotg->op_state = OTG_STATE_B_PERIPHERAL;
-               /*
-                * If controller is hibernated, it must exit from hibernation
-                * before being initialized
-                */
-               if (hsotg->lx_state == DWC2_L2)
-                       dwc2_exit_hibernation(hsotg, false);
 
                dwc2_hsotg_core_init_disconnected(hsotg, false);
                if (hsotg->enabled)
-- 
2.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to