projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2284bb3
)
usb: phy: fsm: change "|" to "||" for condition OTG_STATE_A_WAIT_BCON at statemachine
author
Peter Chen
<peter.chen@freescale.com>
Thu, 13 Mar 2014 07:22:51 +0000
(15:22 +0800)
committer
Felipe Balbi
<balbi@ti.com>
Thu, 24 Apr 2014 14:54:32 +0000
(09:54 -0500)
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
patch
|
blob
|
history
diff --git
a/drivers/usb/phy/phy-fsm-usb.c
b/drivers/usb/phy/phy-fsm-usb.c
index 731b4a5d6639da129c5e99476f33e1f7266c70b1..d03fadd2629f1419b00a60ef9d842913c5ae6183 100644
(file)
--- a/
drivers/usb/phy/phy-fsm-usb.c
+++ b/
drivers/usb/phy/phy-fsm-usb.c
@@
-314,7
+314,7
@@
int otg_statemachine(struct otg_fsm *fsm)
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: