Title: [9083] trunk/drivers/usb/musb/blackfin.c: Fix bug [#6185], only start timer handler in host mode.
Revision
9083
Author
lliubbo
Date
2010-08-16 05:28:18 -0400 (Mon, 16 Aug 2010)

Log Message

Fix bug [#6185], only start timer handler in host mode.

Modified Paths

Diff

Modified: trunk/drivers/usb/musb/blackfin.c (9082 => 9083)


--- trunk/drivers/usb/musb/blackfin.c	2010-08-13 21:53:01 UTC (rev 9082)
+++ trunk/drivers/usb/musb/blackfin.c	2010-08-16 09:28:18 UTC (rev 9083)
@@ -173,7 +173,7 @@
 	/* Start sampling ID pin, when plug is removed from MUSB */
 	if ((is_otg_enabled(musb) && (musb->xceiv->state == OTG_STATE_B_IDLE
 		|| musb->xceiv->state == OTG_STATE_A_WAIT_BCON)) ||
-		(musb->int_usb & MUSB_INTR_DISCONNECT)) {
+		(musb->int_usb & MUSB_INTR_DISCONNECT && is_host_active(musb))) {
 		mod_timer(&musb_conn_timer, jiffies + TIMER_DELAY);
 		musb->a_wait_bcon = TIMER_DELAY;
 	}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to