shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge 6.1.99 into android14-6.1-lts

Browse Source 
Changes in 6.1.99
	Revert "usb: xhci: prevent potential failure in handle_tx_event() for Transfer events without TRB"
	Linux 6.1.99

Change-Id: I330d0af3322ee885eea719688b8d260cd7cec39c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-07-24 17:24:00 +00:00
parent e6e7b1084c cac15753b8
commit 12f9bcc034
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
VERSION = 6 VERSION = 6
PATCHLEVEL = 1 PATCHLEVEL = 1
SUBLEVEL = 98 SUBLEVEL = 99
EXTRAVERSION = EXTRAVERSION =
NAME = Curry Ramen NAME = Curry Ramen

5
drivers/usb/host/xhci-ring.c
View File

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