Add David Hewson's corrections to the LPC214x USB device driver; Add LPC214x configuration to test the USB composite device

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4359 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 7 insertions, 2 deletions

diff --git a/apps/examples/composite/composite_main.c b/apps/examples/composite/composite_main.c
index 0166b7fa1..6c2a86287 100644
--- a/apps/examples/composite/composite_main.c
+++ b/apps/examples/composite/composite_main.c
@@ -373,6 +373,9 @@ static int dumptrace(void)
 static int open_serial(void)
 {
   int errcode;
+#ifdef CONFIG_USBDEV_TRACE
+  int ret;
+#endif
 
   /* Open the USB serial device for writing (blocking) */
 
@@ -402,13 +405,15 @@ static int open_serial(void)
             }
         }
 
-      /* If USB tracing is enabled, then dump all collected trace data to stdout */
+      /* If USB tracing is enabled, then dump all collected trace data to
+       * stdout.
+       */
 
 #ifdef CONFIG_USBDEV_TRACE
       ret = dumptrace();
       if (ret < 0)
         {
-          goto errout;
+          return ret;
         }
 #endif
     }