Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
usb
/
host
/
ehci-hub.c
diff --git
a/kernel/drivers/usb/host/ehci-hub.c
b/kernel/drivers/usb/host/ehci-hub.c
index
6920844
..
086a711
100644
(file)
--- a/
kernel/drivers/usb/host/ehci-hub.c
+++ b/
kernel/drivers/usb/host/ehci-hub.c
@@
-155,7
+155,7
@@
static int ehci_port_change(struct ehci_hcd *ehci)
return 0;
}
return 0;
}
-
static
void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
+void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
bool suspending, bool do_wakeup)
{
int port;
bool suspending, bool do_wakeup)
{
int port;
@@
-220,6
+220,7
@@
static void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
spin_unlock_irq(&ehci->lock);
}
spin_unlock_irq(&ehci->lock);
}
+EXPORT_SYMBOL_GPL(ehci_adjust_port_wakeup_flags);
static int ehci_bus_suspend (struct usb_hcd *hcd)
{
static int ehci_bus_suspend (struct usb_hcd *hcd)
{
@@
-1220,6
+1221,13
@@
int ehci_hub_control(
*/
ehci->reset_done [wIndex] = jiffies
+ msecs_to_jiffies (50);
*/
ehci->reset_done [wIndex] = jiffies
+ msecs_to_jiffies (50);
+
+ /*
+ * Force full-speed connect for FSL high-speed
+ * erratum; disable HS Chirp by setting PFSC bit
+ */
+ if (ehci_has_fsl_hs_errata(ehci))
+ temp |= (1 << PORTSC_FSL_PFSC);
}
ehci_writel(ehci, temp, status_reg);
break;
}
ehci_writel(ehci, temp, status_reg);
break;