sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminate a warning

Browse Source
This commit is contained in:
Gregory Nutt 2015-09-08 07:46:48 -06:00
parent a5d4ed2fef
commit f52a228eef
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
system/composite/composite_main.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* system/composite/composite_main.c
*
* Copyright (C) 2012-2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2012-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -706,7 +706,6 @@ int conn_main(int argc, char *argv[])
*/
#ifdef CONFIG_NSH_BUILTIN_APPS
/* Check if there is a non-NULL USB mass storage device handle (meaning that the
* USB mass storage device is already configured).
*/
@ -760,7 +759,7 @@ int conn_main(int argc, char *argv[])
ret = dumptrace();
if (ret < 0)
{
goto errout;
goto errout_bad_dump;
}
#endif
@ -831,11 +830,16 @@ int conn_main(int argc, char *argv[])
final_memory_usage("Final memory usage");
return 0;
errout:
#if defined(CONFIG_USBDEV_TRACE) && CONFIG_USBDEV_TRACE_INITIALIDSET != 0
errout_bad_dump:
#endif
#if !defined(CONFIG_NSH_BUILTIN_APPS) && !defined(CONFIG_DISABLE_SIGNALS)
errout:
close(g_composite.infd);
close(g_composite.outfd);
#endif
composite_uninitialize(g_composite.cmphandle);
final_memory_usage("Final memory usage");
return 1;