Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2022-12-08 17:11:29 +00:00
commit 9e9e2c775a

View File

@ -130,7 +130,7 @@ static const USBDescriptor *usb_get_descriptor_cb(USBDriver *usbp, uint8_t dtype
uint16_t wValue = ((uint16_t)dtype << 8) | dindex; uint16_t wValue = ((uint16_t)dtype << 8) | dindex;
uint16_t wLength = ((uint16_t)usbp->setup[7] << 8) | usbp->setup[6]; uint16_t wLength = ((uint16_t)usbp->setup[7] << 8) | usbp->setup[6];
desc.ud_string = NULL; desc.ud_string = NULL;
desc.ud_size = get_usb_descriptor(wValue, wIndex, wLength, (const void **const)&desc.ud_string); desc.ud_size = get_usb_descriptor(wValue, wIndex, wLength, (const void **const) & desc.ud_string);
if (desc.ud_string == NULL) if (desc.ud_string == NULL)
return NULL; return NULL;
else else