1 files changed, 6 insertions, 4 deletions
diff --git a/src/device/usbd.c b/src/device/usbd.c
index 9d0bc0f3f..cf96f050d 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -352,11 +352,13 @@ TU_ATTR_ALWAYS_INLINE static inline usbd_class_driver_t const * get_driver(uint8
   if (drvid < _app_driver_count) {
     // Application drivers
     driver = &_app_driver[drvid];
-  } else if (drvid < TOTAL_DRIVER_COUNT && BUILTIN_DRIVER_COUNT > 0) {
-    driver = &_usbd_driver[drvid - _app_driver_count];
-  } else {
-    // nothing to do
+  } else{
+    drvid -= _app_driver_count;
+    if (drvid < BUILTIN_DRIVER_COUNT) {
+      driver = &_usbd_driver[drvid];
+    }
   }
+
   return driver;
 }