From: lyz <lyz@rock-chips.com>
Date: Mon, 23 Mar 2015 08:57:46 +0000 (+0800)
Subject: usb: dwc_otg: fix bug in FORCE_HOST_MODE
X-Git-Tag: firefly_0821_release~4158^2~303
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6188958f038dcb66d890405db0e28acd137506e3;p=firefly-linux-kernel-4.4.55.git

usb: dwc_otg: fix bug in FORCE_HOST_MODE
---

diff --git a/drivers/usb/dwc_otg_310/dwc_otg_driver.c b/drivers/usb/dwc_otg_310/dwc_otg_driver.c
index 58abce5e7a3f..3aa41733671f 100755
--- a/drivers/usb/dwc_otg_310/dwc_otg_driver.c
+++ b/drivers/usb/dwc_otg_310/dwc_otg_driver.c
@@ -1520,7 +1520,8 @@ static int otg20_driver_probe(struct platform_device *_dev)
 	 * perform initial actions required for Internal ADP logic.
 	 */
 	if (!dwc_otg_get_param_adp_enable(dwc_otg_device->core_if)) {
-		if (pldata->phy_status == USB_PHY_ENABLED) {
+		if (dwc_otg_device->core_if->usb_mode == USB_MODE_NORMAL &&
+		    pldata->phy_status == USB_PHY_ENABLED) {
 			pldata->phy_suspend(pldata, USB_PHY_SUSPEND);
 			udelay(3);
 			pldata->clock_enable(pldata, 0);