summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Chen <peter.chen@freescale.com>2012-02-09 17:07:44 +0800
committerPeter Chen <peter.chen@freescale.com>2012-02-09 17:32:19 +0800
commit62ea60a0712052c43618d1cac968ccf51e3a4e5e (patch)
tree875e35533201b9497b765674f297db7bc80bc05e
parent0d641cb1cd344a551f84f46101e2491b2206d295 (diff)
ENGR00174124: Revert "[USB Host]change the default wakeup value of RH"
This patch creates two bugs at current i.mx usb framework. - The high speed device can't be recognized at the first time. - The usb device can't be recognized after system resume with usb vbus. The reason why it creates bugs that it changes (auto)suspend/resume process for usb core. This reverts commit e5c4318450e1fe7c61950214e779658c6cea0da7. Signed-off-by: Peter Chen <peter.chen@freescale.com>
-rwxr-xr-xdrivers/usb/host/ehci-arc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-arc.c b/drivers/usb/host/ehci-arc.c
index 39d288db7eb1..99ba497f5f5a 100755
--- a/drivers/usb/host/ehci-arc.c
+++ b/drivers/usb/host/ehci-arc.c
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2005 MontaVista Software
- * Copyright (C) 2011-2012 Freescale Semiconductor, Inc.
+ * Copyright (C) 2012 Freescale Semiconductor, Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -521,9 +521,6 @@ static int ehci_fsl_setup(struct usb_hcd *hcd)
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
int retval;
- /* overwrite the default wakeup strategy */
- device_set_wakeup_enable(&hcd->self.root_hub->dev, false);
-
/* EHCI registers start at offset 0x100 */
ehci->caps = hcd->regs + 0x100;
ehci->regs = hcd->regs + 0x100 +