Changing the bitwise to a logical OR created a huge hard to find bug. It shortcutted the call to the class function,

so, lets use shortcutting anyway?
This commit is contained in:
Nathan Conrad 2019-09-21 19:29:57 -04:00
parent fbb8520acd
commit 9498adef71
1 changed files with 3 additions and 2 deletions

View File

@ -549,9 +549,10 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
// must not call tud_control_status(), and return value will have no effect
// class driver is invoked last, so that EP already has EP stall cleared (in event of clear feature EP halt)
if ( usbd_class_drivers[drv_id].control_request )
if ( usbd_class_drivers[drv_id].control_request &&
usbd_class_drivers[drv_id].control_request(rhport, p_request))
{
ret = ret || usbd_class_drivers[drv_id].control_request(rhport, p_request);
ret = true;
}
return ret;
}