diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-25 16:47:28 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-25 16:47:28 +0000 |
commit | ffcaa123f477ac9062398c06b68950203f0c899a (patch) | |
tree | 5ae0d3a4edccd428088dcf117a5241387c6d6f21 /nuttx/arch | |
parent | 798d0d0debae5b8dc0f40844adf18ce14906cfd7 (diff) | |
download | px4-nuttx-ffcaa123f477ac9062398c06b68950203f0c899a.tar.gz px4-nuttx-ffcaa123f477ac9062398c06b68950203f0c899a.tar.bz2 px4-nuttx-ffcaa123f477ac9062398c06b68950203f0c899a.zip |
Fix infinite loop in CDC/ACM driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4655 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
-rwxr-xr-x | nuttx/arch/arm/src/stm32/stm32_otgfsdev.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c b/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c index 6604a004b..e36f4e33b 100755 --- a/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c +++ b/nuttx/arch/arm/src/stm32/stm32_otgfsdev.c @@ -1870,6 +1870,7 @@ static void stm32_usbreset(struct stm32_usbdev_s *priv) privep->stalled = false; } + stm32_putreg(0xffffffff, STM32_OTGFS_DAINT); /* Mask all device endpoint interrupts except EP0 */ @@ -5283,6 +5284,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver) */ FAR struct stm32_usbdev_s *priv = &g_otgfsdev; + irqstate_t flags; usbtrace(TRACE_DEVUNREGISTER, 0); @@ -5294,6 +5296,13 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver) } #endif + /* Reset the hardware and cancel all requests. All requests must be + * canceled while the class driver is still bound. + */ + + flags = irqsave(); + stm32_usbreset(priv); + /* Unbind the class driver */ CLASS_UNBIND(driver, &priv->usbdev); @@ -5302,9 +5311,15 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver) up_disable_irq(STM32_IRQ_OTGFS); + /* Disconnect device */ + + stm32_pullup(&priv->usbdev, false); + /* Unhook the driver */ priv->driver = NULL; + irqrestore(flags); + return OK; } |