summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorNikhil Badola <nikhil.badola@freescale.com>2014-12-04 04:53:10 (GMT)
committerMatthew Weigel <Matthew.Weigel@freescale.com>2014-12-11 18:41:54 (GMT)
commitada621a433512b120c8baff0e7793935396f6e45 (patch)
treebebbef781e5dbb7e1d81a90ea52798d90088e676 /drivers/usb
parent08587394a7ea234a74b74a38499d43c081731846 (diff)
downloadlinux-fsl-qoriq-ada621a433512b120c8baff0e7793935396f6e45.tar.xz
drivers: usb: Modify workaround for USB Erratum A005697
Change the position of delay introduced by erratum A005697 workaround Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com> Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com> Change-Id: Idb1127ac310efc6eba7726a7b95a41a830aba178 Reviewed-on: http://git.am.freescale.net:8181/25349 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Matthew Weigel <Matthew.Weigel@freescale.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-hub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 9e00422..d87444c 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -286,8 +286,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
else if ((t1 & PORT_PE) && !(t1 & PORT_SUSPEND)) {
t2 |= PORT_SUSPEND;
set_bit(port, &ehci->bus_suspended);
- if (ehci_has_fsl_susp_errata(ehci))
- usleep_range(10000, 20000);
}
/* enable remote wakeup on all ports, if told to do so */
@@ -315,6 +313,8 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
USB_PORT_STAT_HIGH_SPEED)
fs_idle_delay = true;
ehci_writel(ehci, t2, reg);
+ if (ehci_has_fsl_susp_errata(ehci))
+ usleep_range(10000, 20000);
changed = 1;
}
}