commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=99411eece9dd18c71bed7d4b08c1087a6e88029d
branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/2012R2

commit aab58a379409441498ecd6a76ff0daf9c30b8417  will cause usb can't wake up
from mem now so revert it.

Signed-off-by: Bob Liu <[email protected]>
---
 drivers/usb/musb/musb_core.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index f1f62da..0d7e4cb 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2250,18 +2250,6 @@ static void musb_restore_context(struct musb *musb)
 	musb_writeb(musb_base, MUSB_INTRUSBE, musb->context.intrusbe);
 	musb_writeb(musb_base, MUSB_DEVCTL, musb->context.devctl);
 
-#if defined(CONFIG_USB_MUSB_BLACKFIN) && !CONFIG_BF60x
-	/*
-	 * Blackfin musb-host can't resume without reprobe if not polling for
-	 * detected 'A'device.
-	 */
-	if (is_host_enabled(musb) && (musb->xceiv->state != OTG_STATE_B_IDLE)
-			&& (musb->xceiv->state != OTG_STATE_B_PERIPHERAL)) {
-		while (musb_readb(musb_base, MUSB_DEVCTL) & MUSB_DEVCTL_BDEVICE)
-			mdelay(10);
-	}
-#endif
-
 	for (i = 0; i < musb->config->num_eps; ++i) {
 		struct musb_hw_ep	*hw_ep;
 
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to