diff options
| author | px4dev <px4@purgatory.org> | 2013-05-19 21:51:35 +0200 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-05-19 21:51:35 +0200 |
| commit | b7d430e3c06c10411419bfc8bfb30574f7a9cb56 (patch) | |
| tree | 994a105907415d5b6d877c436126410b25562aa4 /nuttx/arch | |
| parent | c6b7eb1224426d9ec2e6d59a3df4c7443449109a (diff) | |
| parent | 504b6d12561d68874ded4c1f747c21926a065045 (diff) | |
| download | px4-firmware-b7d430e3c06c10411419bfc8bfb30574f7a9cb56.tar.gz px4-firmware-b7d430e3c06c10411419bfc8bfb30574f7a9cb56.tar.bz2 px4-firmware-b7d430e3c06c10411419bfc8bfb30574f7a9cb56.zip | |
Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup
Fix px4iov2 build issue by selecting the correct NuttX config.
Diffstat (limited to 'nuttx/arch')
| -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); |