From: wlf <wulf@rock-chips.com>
Date: Sun, 28 Sep 2014 02:22:40 +0000 (+0800)
Subject: USB: fix usb host connect detect timer.
X-Git-Tag: firefly_0821_release~4638
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7889d6f7021e02b2575e1748d410fb53b45cb25a;p=firefly-linux-kernel-4.4.55.git

USB: fix usb host connect detect timer.
---

diff --git a/drivers/usb/dwc_otg_310/dwc_otg_hcd_linux.c b/drivers/usb/dwc_otg_310/dwc_otg_hcd_linux.c
index 0f6eb8a95c99..43527f8763ce 100755
--- a/drivers/usb/dwc_otg_310/dwc_otg_hcd_linux.c
+++ b/drivers/usb/dwc_otg_310/dwc_otg_hcd_linux.c
@@ -637,7 +637,7 @@ int host20_hcd_init(struct platform_device *_dev)
 	dwc_otg_hcd->connect_detect_timer.function = dwc_otg_hcd_connect_detect;
 	dwc_otg_hcd->connect_detect_timer.data = (unsigned long)(dwc_otg_hcd);
 	init_timer(&dwc_otg_hcd->connect_detect_timer);
-	mod_timer(&dwc_otg_hcd->connect_detect_timer, jiffies + (HZ << 3));
+	mod_timer(&dwc_otg_hcd->connect_detect_timer, jiffies + (HZ << 1));
 
 	INIT_DELAYED_WORK(&dwc_otg_hcd->host_enable_work, dwc_otg_hcd_enable);
 	return 0;
diff --git a/drivers/usb/host/ehci-rockchip.c b/drivers/usb/host/ehci-rockchip.c
index 03217cd22e7e..207d6f5301f8 100755
--- a/drivers/usb/host/ehci-rockchip.c
+++ b/drivers/usb/host/ehci-rockchip.c
@@ -415,7 +415,7 @@ static int ehci_rk_probe(struct platform_device *pdev)
 	rk_ehci->connect_detect_timer.function = rk_ehci_hcd_connect_detect;
 	rk_ehci->connect_detect_timer.data = (unsigned long)(rk_ehci);
 	init_timer(&rk_ehci->connect_detect_timer);
-	mod_timer(&rk_ehci->connect_detect_timer, jiffies + (HZ << 3));
+	mod_timer(&rk_ehci->connect_detect_timer, jiffies + (HZ << 1));
 	INIT_DELAYED_WORK(&rk_ehci->host_enable_work, rk_ehci_hcd_enable);
 
 	ehci_port_power(ehci, 0);