diff options
| author | Julian Oes <julian@oes.ch> | 2013-05-17 11:24:02 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-05-17 11:24:02 +0200 |
| commit | f5c157e74df12a0cb36b7d27cdad9828d96cc534 (patch) | |
| tree | 3f758990921a7b52df8afe5131a8298b1141b6f4 /nuttx/arch/arm/src/stm32/stm32_otgfsdev.c | |
| parent | 80e8eeab2931e79e31adb17c93f5794e666c5763 (diff) | |
| parent | fa816d0fd65da461fd5bf8803cf00caebaf23c5c (diff) | |
| download | px4-firmware-f5c157e74df12a0cb36b7d27cdad9828d96cc534.tar.gz px4-firmware-f5c157e74df12a0cb36b7d27cdad9828d96cc534.tar.bz2 px4-firmware-f5c157e74df12a0cb36b7d27cdad9828d96cc534.zip | |
Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
src/drivers/px4io/px4io.cpp
src/modules/commander/commander.c
src/modules/commander/state_machine_helper.c
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_otgfsdev.c')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_otgfsdev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c b/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c index 2c9ae4cac..0fcd463e0 100644 --- a/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c @@ -1512,7 +1512,6 @@ static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt) DEBUGASSERT(privep && privep->ep.priv); priv = (FAR struct stm32_usbdev_s *)privep->ep.priv; - DEBUGASSERT(priv->ep0state == EP0STATE_SETUP_OUT); ullvdbg("EP0: bcnt=%d\n", bcnt); usbtrace(TRACE_READ(EP0), bcnt); |