diff --git a/drivers/usb/usb_device.c b/drivers/usb/usb_device.c
index 7fcb39b..7dd3f60 100644
--- a/drivers/usb/usb_device.c
+++ b/drivers/usb/usb_device.c
@@ -74,7 +74,6 @@
 
 	case USB_DESC_TYPE_CONFIGURATION:
 		pbuf = pdev->desc->get_config_desc(&len);
-		pbuf[1] = USB_DESC_TYPE_CONFIGURATION;
 		break;
 
 	case USB_DESC_TYPE_STRING:
@@ -116,8 +115,11 @@
 		break;
 
 	case USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION:
-		pbuf = pdev->desc->get_config_desc(&len);
-		pbuf[1] = USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION;
+		if (pdev->desc->get_other_speed_config_desc == NULL) {
+			usb_core_ctl_error(pdev);
+			return;
+		}
+		pbuf = pdev->desc->get_other_speed_config_desc(&len);
 		break;
 
 	default: