diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c
index a5e85a347b..599da8a004 100644
--- a/drivers/usbdev/cdcacm.c
+++ b/drivers/usbdev/cdcacm.c
@@ -2447,19 +2447,19 @@ int cdcacm_initialize(int minor, FAR void **handle)
   /* Interfaces */
 
   devdesc.ninterfaces = CDCACM_NINTERFACES; /* Number of interfaces in the configuration */
-  devdesc.ifnobase    = 0; /* Offset to Interface-IDs */
+  devdesc.ifnobase    = 0;                  /* Offset to Interface-IDs */
 
   /* Strings */
 
-  devdesc.nstrings    = CDCACM_NSTRIDS; /* Number of Strings */
-  devdesc.strbase     = 0; /* Offset to String Numbers */
+  devdesc.nstrings    = CDCACM_NSTRIDS;     /* Number of Strings */
+  devdesc.strbase     = 0;                  /* Offset to String Numbers */
 
   /* Endpoints */
 
   devdesc.nendpoints                  = CDCACM_NUM_EPS;
-  devdesc.epno[CDCACM_EP_INTIN_IDX]   = 0;
-  devdesc.epno[CDCACM_EP_BULKIN_IDX]  = 1;
-  devdesc.epno[CDCACM_EP_BULKOUT_IDX] = 2;
+  devdesc.epno[CDCACM_EP_INTIN_IDX]   = 1;  /* Must be provided by board logic */
+  devdesc.epno[CDCACM_EP_BULKIN_IDX]  = 2;
+  devdesc.epno[CDCACM_EP_BULKOUT_IDX] = 3;
 
   /* Get an instance of the serial driver class object */
 
@@ -2471,7 +2471,8 @@ int cdcacm_initialize(int minor, FAR void **handle)
       ret = usbdev_register(drvr);
       if (ret < 0)
         {
-          usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_DEVREGISTER), (uint16_t)-ret);
+          usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_DEVREGISTER),
+                   (uint16_t)-ret);
         }
     }
 
diff --git a/drivers/usbdev/usbmsc.c b/drivers/usbdev/usbmsc.c
index 3001e2579b..7a20daa5cb 100644
--- a/drivers/usbdev/usbmsc.c
+++ b/drivers/usbdev/usbmsc.c
@@ -1891,25 +1891,25 @@ void usbmsc_get_composite_devdesc(FAR struct composite_devdesc_s *dev)
   dev->classobject         = 0;
   dev->uninitialize        = 0;
 
-  dev->nconfigs            = USBMSC_NCONFIGS;          /* Number of configurations supported */
-  dev->configid            = USBMSC_CONFIGID;          /* The only supported configuration ID */
-  dev->cfgdescsize         = SIZEOF_USBMSC_CFGDESC;    /* The size of the config descriptor */
-  dev->minor               = 0;                        /* The minor interface number */
+  dev->nconfigs            = USBMSC_NCONFIGS;        /* Number of configurations supported */
+  dev->configid            = USBMSC_CONFIGID;        /* The only supported configuration ID */
+  dev->cfgdescsize         = SIZEOF_USBMSC_CFGDESC;  /* The size of the config descriptor */
+  dev->minor               = 0;                      /* The minor interface number */
 
   /* Interfaces */
 
-  dev->devdesc.ninterfaces = USBMSC_NINTERFACES; /* Number of interfaces in the configuration */
-  dev->devdesc.ifnobase    = 0;                  /* Offset to Interface-IDs */
+  dev->devdesc.ninterfaces = USBMSC_NINTERFACES;     /* Number of interfaces in the configuration */
+  dev->devdesc.ifnobase    = 0;                      /* Offset to Interface-IDs */
 
   /* Strings */
 
-  dev->devdesc.nstrings    = USBMSC_NSTRIDS;        /* Number of Strings */
-  dev->devdesc.strbase     = 0;                     /* Offset to String Numbers */
+  dev->devdesc.nstrings    = USBMSC_NSTRIDS;         /* Number of Strings */
+  dev->devdesc.strbase     = 0;                      /* Offset to String Numbers */
 
   /* Endpoints */
 
   dev->devdesc.nendpoints                  = USBMSC_NENDPOINTS;
-  dev->devdesc.epno[USBMSC_EP_BULKIN_IDX]  = 0;
+  dev->devdesc.epno[USBMSC_EP_BULKIN_IDX]  = 0;      /* Must be provided by board logic */
   dev->devdesc.epno[USBMSC_EP_BULKOUT_IDX] = 0;
 }
 #endif
\ No newline at end of file