Merge 5.7-rc3 into usb-next
We need the USB fixes in here too. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -727,19 +727,19 @@ static void xdbc_handle_tx_event(struct xdbc_trb *evt_trb)
|
||||
case COMP_USB_TRANSACTION_ERROR:
|
||||
case COMP_STALL_ERROR:
|
||||
default:
|
||||
if (ep_id == XDBC_EPID_OUT)
|
||||
if (ep_id == XDBC_EPID_OUT || ep_id == XDBC_EPID_OUT_INTEL)
|
||||
xdbc.flags |= XDBC_FLAGS_OUT_STALL;
|
||||
if (ep_id == XDBC_EPID_IN)
|
||||
if (ep_id == XDBC_EPID_IN || ep_id == XDBC_EPID_IN_INTEL)
|
||||
xdbc.flags |= XDBC_FLAGS_IN_STALL;
|
||||
|
||||
xdbc_trace("endpoint %d stalled\n", ep_id);
|
||||
break;
|
||||
}
|
||||
|
||||
if (ep_id == XDBC_EPID_IN) {
|
||||
if (ep_id == XDBC_EPID_IN || ep_id == XDBC_EPID_IN_INTEL) {
|
||||
xdbc.flags &= ~XDBC_FLAGS_IN_PROCESS;
|
||||
xdbc_bulk_transfer(NULL, XDBC_MAX_PACKET, true);
|
||||
} else if (ep_id == XDBC_EPID_OUT) {
|
||||
} else if (ep_id == XDBC_EPID_OUT || ep_id == XDBC_EPID_OUT_INTEL) {
|
||||
xdbc.flags &= ~XDBC_FLAGS_OUT_PROCESS;
|
||||
} else {
|
||||
xdbc_trace("invalid endpoint id %d\n", ep_id);
|
||||
|
Reference in New Issue
Block a user