This is the 6.6.40 stable release

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmaUzt8ACgkQONu9yGCS
 aT6MEhAAjUzAB1x0tknqihRsF1RNkLXVuk9XJZmSCOK4qIZueHT4Em+8oyMPWVJA
 uxjsQxKFbXOnAy9oQTPV57xGxCnxp8Ef0HNeSjK02NqKGQ9SzqmO0hzQKVIB+CaL
 Zs2dBb8OADmE0r/SrK2jyApxUovrNZCgMFsYWrKWef2T0C2ZCzu6zG0uk6JrKXT8
 KVSgxnoAUFyXOTHrJQPfBNWZmyQCdBk8IIhn4UgIP4FY3oXSPyiB0PBrMN54+kwK
 fjfPYyJ53IeOGfAmdIy2OoDyLOMACkyqMfZri65L0s1QGX2MTXd5NwU+5GA2+tvZ
 bV/U7Ukb2qgbIGKlw+bDU+rEdCw9wWTQA9UmB+M9o1JgScvnoYUQmjq+AWoqNmXa
 gE2yc1u7u+B5KaDcmlHuK/UP4IEAvPCvKS9vAimegSS5fpSUXzdF4CPnmQKXZaSU
 DXkGFJo7esYUfxJx8BGbFMFumk/LvIwvGYyX6tI2cI7Fo8PMQSAx/hAT5NNIB/U9
 0c6lwLFL6LAMH/jvWeJxW1PcZO26+Ipp+h3hP83xmKL70APpUdmXsaXSeEv8LQeP
 N2Km8xM0vla7Qh5s8yJf+oYSnjBYusng8uY1iZ04aJgSQZQJK3RoWh6w98+FJbo6
 4Rrlk+lGMkmCIusqH+NcDRAmRZXBqdr8VwW+0vFpCXOtNcnAIdE=
 =RfrC
 -----END PGP SIGNATURE-----

Merge 6.6.40 into android15-6.6-lts

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

Change-Id: I1787f5d205eb04851e8de1a0cf1e82b928caf6e3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-07-19 13:12:44 +00:00
commit 96c1873721
2 changed files with 3 additions and 4 deletions

View File

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

View File

@ -2652,17 +2652,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 */