diff options
| author | Wolfram Sang <wsa@kernel.org> | 2020-05-20 16:27:45 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2020-05-20 16:27:45 +0300 |
| commit | f89c326dcaa0cb8c3af7764e75eeed4e3f3c879a (patch) | |
| tree | 31a5967da1f04180a1a922258f6947ad17255ee8 /drivers/usb/early/xhci-dbc.c | |
| parent | 6fe12cdbcfe35ad4726a619a9546822d34fc934c (diff) | |
| parent | efa7fb4c6c8e4171fd29a5935a9dc7a28e363278 (diff) | |
| download | linux-f89c326dcaa0cb8c3af7764e75eeed4e3f3c879a.tar.xz | |
Merge branch 'i2c/for-current-fixed' into i2c/for-5.8
Diffstat (limited to 'drivers/usb/early/xhci-dbc.c')
| -rw-r--r-- | drivers/usb/early/xhci-dbc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c index 971c6b92484a..171280c80228 100644 --- a/drivers/usb/early/xhci-dbc.c +++ b/drivers/usb/early/xhci-dbc.c @@ -728,19 +728,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); |