summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-11-07 17:43:14 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-11-07 17:43:14 -0600
commit2b04a69bba2249f83cf4827269dd02e58ceadf29 (patch)
treeb1f76c93385925613b0c61be1d0b85e7fd119045 /apps
parent15bc6e0f3401e0e4435e6236f990729ea6c16ade (diff)
downloadnuttx-2b04a69bba2249f83cf4827269dd02e58ceadf29.tar.gz
nuttx-2b04a69bba2249f83cf4827269dd02e58ceadf29.tar.bz2
nuttx-2b04a69bba2249f83cf4827269dd02e58ceadf29.zip
apps/examples/composite: Bug fix. Wrong handle being nullified. From David Sidrane
Diffstat (limited to 'apps')
-rw-r--r--apps/ChangeLog.txt2
-rw-r--r--apps/system/composite/composite_main.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 935ef9ef1..e1ed0e677 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -728,4 +728,6 @@
driver features. From Ken Pettit (2013-11-1).
* apps/nshlib/nsh.h: Allow USB trace wihtout a USB console. From
David Sidrane (2013-11-06).
+ * apps/system/composite/composite_main.c: The wrong handle was getting
+ nullified. From David Sidrane (2013-11-7).
diff --git a/apps/system/composite/composite_main.c b/apps/system/composite/composite_main.c
index b5a41a2fd..28d8e38aa 100644
--- a/apps/system/composite/composite_main.c
+++ b/apps/system/composite/composite_main.c
@@ -840,7 +840,7 @@ int disconn_main(int argc, char *argv[])
/* Then disconnect the device and uninitialize the USB mass storage driver */
composite_uninitialize(g_composite.cmphandle);
- g_composite.mschandle = NULL;
+ g_composite.cmphandle = NULL;
message("disconn_main: Disconnected\n");
check_test_memory_usage("After composite_uninitialize()");