diff --git a/boards/sim/sim/sim/configs/usbdev/defconfig b/boards/sim/sim/sim/configs/usbdev/defconfig
index 28174f28b0d..a009d80ffec 100644
--- a/boards/sim/sim/sim/configs/usbdev/defconfig
+++ b/boards/sim/sim/sim/configs/usbdev/defconfig
@@ -35,7 +35,6 @@ CONFIG_DEBUG_USB_WARN=y
 CONFIG_EXAMPLES_DHCPD=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_TMPFS=y
-CONFIG_HAVE_CXX=y
 CONFIG_ICMPv6_AUTOCONF_RDNSS=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_IOB_NBUFFERS=512
diff --git a/drivers/usbdev/cdcecm.h b/drivers/usbdev/cdcecm.h
index 6795269ef3d..e221076fa47 100644
--- a/drivers/usbdev/cdcecm.h
+++ b/drivers/usbdev/cdcecm.h
@@ -37,7 +37,7 @@
  ****************************************************************************/
 
 #define CDCECM_VERSIONNO         (0x0100)
-#define CDCECM_MXDESCLEN         (80)
+#define CDCECM_MXDESCLEN         (120)
 #define CDCECM_MAXSTRLEN         (CDCECM_MXDESCLEN - 2)
 #define CDCECM_NCONFIGS          (1)
 #define CDCECM_NINTERFACES       (2)
diff --git a/drivers/usbdev/cdcncm.c b/drivers/usbdev/cdcncm.c
index 34b7d0aace6..a7646d36fe7 100644
--- a/drivers/usbdev/cdcncm.c
+++ b/drivers/usbdev/cdcncm.c
@@ -1400,7 +1400,7 @@ static int ncm_notify(FAR struct cdcncm_driver_s *self)
 
           /* SPEED_CHANGE data is up/down speeds in bits/sec */
 
-          data    = (FAR uint32_t *)(self->ctrlreq->buf + sizeof(*req));
+          data    = (FAR uint32_t *)(self->notifyreq->buf + sizeof(*req));
           data[0] = self->usbdev.speed == USB_SPEED_HIGH ?
                     CDCECM_HIGH_BITRATE : CDCECM_LOW_BITRATE;
           data[1] = data[0];