summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-10-31 15:27:52 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-10-31 15:27:52 -0600
commitb6814d7a4a44f58992704e2b85502ccc5dd0e331 (patch)
tree48ce57e5c7b4699df82b83bc05f228ffe327ab96
parent069e297bc0c07b58594efaa2eab1ded52a307f82 (diff)
downloadnuttx-b6814d7a4a44f58992704e2b85502ccc5dd0e331.tar.gz
nuttx-b6814d7a4a44f58992704e2b85502ccc5dd0e331.tar.bz2
nuttx-b6814d7a4a44f58992704e2b85502ccc5dd0e331.zip
arch/arm/src/stm32/stm32_usbdev.c: On a failure to bind the class driver, the driver reference was being nullified too soon. This caused an exception in usbdev_reset() later. The driver reference will be null
ified later usbdev_unregister when the caller gets the error. From David Sidrane
-rw-r--r--nuttx/ChangeLog5
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_usbdev.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 941b02e41..4e1a5c574 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5919,4 +5919,9 @@
header file (2013-10-31).
* drivers/mtd/mtd_partition.c: Fix erase block vs page block confusion.
From Ken Pettit (2013-10-31).
+ * arch/arm/src/stm32/stm32_usbdev.c: On a failure to bind the class
+ driver, the driver reference was being nullified too soon. This
+ caused an exception in usbdev_reset() later. The driver reference
+ will be nullified later usbdev_unregister when the caller gets the
+ error. From David Sidrane (2013-10-31).
diff --git a/nuttx/arch/arm/src/stm32/stm32_usbdev.c b/nuttx/arch/arm/src/stm32/stm32_usbdev.c
index d35e707c3..77b569476 100644
--- a/nuttx/arch/arm/src/stm32/stm32_usbdev.c
+++ b/nuttx/arch/arm/src/stm32/stm32_usbdev.c
@@ -3637,7 +3637,6 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
if (ret)
{
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BINDFAILED), (uint16_t)-ret);
- priv->driver = NULL;
}
else
{