diff options
| author |   Peter Chen <peter.chen@freescale.com> | 2014-03-13 15:22:51 +0800 |
|---|---|---|
| committer |   Felipe Balbi <balbi@ti.com> | 2014-04-24 09:54:32 -0500 |
| commit | 66668991c3515855e7a9881788feb7026f9f729f (patch) | |
| tree | 24b99d64d10b16cfc7b29701227fd0dca96e6a5c /drivers/usb/phy | |
| parent | usb: phy: fsm: update OTG HNP state transition (diff) | |
| download | linux-dev-66668991c3515855e7a9881788feb7026f9f729f.tar.xz linux-dev-66668991c3515855e7a9881788feb7026f9f729f.zip | |
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>
Diffstat (limited to 'drivers/usb/phy')
| -rw-r--r-- | drivers/usb/phy/phy-fsm-usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy-fsm-usb.c b/drivers/usb/phy/phy-fsm-usb.c index 731b4a5d6639..d03fadd2629f 100644 --- 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: |