Merge linux 6.6.40

This commit is contained in:
Jianping Liu 2024-07-17 14:20:20 +08:00
commit d41d3a7789
2 changed files with 3 additions and 4 deletions

View File

@ -8,7 +8,7 @@ else
# SPDX-License-Identifier: GPL-2.0
VERSION = 6
PATCHLEVEL = 6
SUBLEVEL = 39
SUBLEVEL = 40
EXTRAVERSION =
NAME = Hurr durr I'ma ninja sloth

View File

@ -2651,17 +2651,16 @@ static int handle_tx_event(struct xhci_hcd *xhci,
else
xhci_handle_halted_endpoint(xhci, ep, NULL,
EP_SOFT_RESET);
break;
goto cleanup;
case COMP_RING_UNDERRUN:
case COMP_RING_OVERRUN:
case COMP_STOPPED_LENGTH_INVALID:
break;
goto cleanup;
default:
xhci_err(xhci, "ERROR Transfer event for unknown stream ring slot %u ep %u\n",
slot_id, ep_index);
goto err_out;
}
return 0;
}
/* Count current td numbers if ep->skip is set */