Index: firmware/usb.c
===================================================================
--- firmware/usb.c (revision 23322)
+++ firmware/usb.c (working copy)
@@ -288,7 +288,8 @@
#ifdef USB_ENABLE_CHARGING_ONLY
usb_core_enable_driver(USB_DRIVER_HID, false);
#else
- usb_core_enable_driver(USB_DRIVER_HID, usb_hid);
+ usb_core_enable_driver(usb_hid ?
+ USB_DRIVER_HID : USB_DRIVER_CHARGING_ONLY, true);
#endif /* USB_ENABLE_CHARGING_ONLY */
#endif /* USB_ENABLE_HID */