diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-11-05 09:12:08 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-11-05 09:12:08 -0600 |
| commit | 6dedeb34190873b3b4bddbfdf377307759c3c848 (patch) | |
| tree | b568723940cd1f01aa5cba2a8c73d1708a767efd /apps | |
| parent | a757713d618934b70e615d9b8203a65c1ba9c84b (diff) | |
| download | nuttx-6dedeb34190873b3b4bddbfdf377307759c3c848.tar.gz nuttx-6dedeb34190873b3b4bddbfdf377307759c3c848.tar.bz2 nuttx-6dedeb34190873b3b4bddbfdf377307759c3c848.zip | |
Correct unitialization of composite USB device. A stale pointer was being reused. From David Sidrane
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/system/composite/composite_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/system/composite/composite_main.c b/apps/system/composite/composite_main.c index b34d38b99..b5a41a2fd 100644 --- a/apps/system/composite/composite_main.c +++ b/apps/system/composite/composite_main.c @@ -434,7 +434,6 @@ static int open_serial(void) message("open_serial: Successfully opened the serial driver\n"); return OK; } -#endif /**************************************************************************** * Name: echo_serial @@ -474,8 +473,10 @@ static int echo_serial(void) message("echo_serial: ERROR: read size: %d write size: %d\n", bytesread, byteswritten); } + return OK; } +#endif /**************************************************************************** * Public Functions @@ -577,6 +578,7 @@ int board_mscclassobject(FAR struct usbdevclass_driver_s **classdev) message("board_mscclassobject: usbmsc_classobject failed: %d\n", -ret); usbmsc_uninitialize(g_composite.mschandle); } + check_test_memory_usage("After usbmsc_classobject()"); return ret; } |