commit 66668991c3515855e7a9881788feb7026f9f729f
author Peter Chen <peter.chen@freescale.com> Thu Mar 13 15:22:51 2014 +0800
committer Felipe Balbi <balbi@ti.com> Thu Apr 24 09:54:32 2014 -0500
tree 24b99d64d10b16cfc7b29701227fd0dca96e6a5c
parent 2284bb35503ce7b05fce8f0dc8e1cb2a3134ae4e

usb: phy: fsm: change "|" to "||" for condition OTG_STATE_A_WAIT_BCON at statemachine

We should be using logical "or" not bitwise "or".

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

drivers/usb/phy/phy-fsm-usb.c

diff --git a/drivers/usb/phy/phy-fsm-usb.c b/drivers/usb/phy/phy-fsm-usb.c
index 731b4a5..d03fadd 100644
--- a/drivers/usb/phy/phy-fsm-usb.c
+++ b/drivers/usb/phy/phy-fsm-usb.c
@@ -314,7 +314,7 @@
 			otg_set_state(fsm, OTG_STATE_A_VBUS_ERR);
 		else if (fsm->b_conn)
 			otg_set_state(fsm, OTG_STATE_A_HOST);
-		else if (fsm->id | fsm->a_bus_drop | fsm->a_wait_bcon_tmout)
+		else if (fsm->id || fsm->a_bus_drop || fsm->a_wait_bcon_tmout)
 			otg_set_state(fsm, OTG_STATE_A_WAIT_VFALL);
 		break;
 	case OTG_STATE_A_HOST: