mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 11:35:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

media updates for v6.13-rc1

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+QmuaPwR3wnBdVwACF8+vY7k4RUFAmc8TpAACgkQCF8+vY7k
 4RUQug//fmDVv94YOgjjfpHYfJU6imzlcTNcHpQnVFbDNSshEOh5bMwEcvhP69pc
 1NxpDuzxAVUgANR09VRG58jevpIm0AROMeG4BV7Ah5BGO8a9YzD/ngZ0QxMZJ3gr
 4q3de6JhEGFvNzidLQMaqaQEcmIl7dFd3A7f/+VpPLBZfbhL67cseItRZ0Bwmxh5
 yu7ENYFqESuvo7maNPrzRaFz0Z34z0pTvNViEK4ZHnkVYDtTurD4EoAWxUaoQIVH
 E802RKWdg4sPiTUeeWw0ONeSZR6pw/QOqalqalKKxVrxWPtrhXUxnrdjwn97VM5u
 H7X5Y4Dkgp86jCjs7aTHfrsAFrlT71XRmbjROwRmwccLXYQeJj0DsHZwYFe4dXx4
 MbNo80hhr8/ADRKkioAwe+omNay998cVWvlinMRHqUfdLQcggW4txb0VGNTE56nL
 BMZ0A05LWuyWqbbejhGmPlj676w5NdK2MCNUtb6ei3TIE1LDeN05t6cfm+1zkfQU
 1I6AdkBfPe7vfQtQtFUD/iQIkG3bl07PwGsCfOnzAkLz95Ap7lMyHG51UwllPkUX
 WGXHQNBVhzoftw5SNPUNAp1GTjPhNFqA1ZaSmBWz8EZazrq/uFMZk3wCAuO1yqI2
 Matp/j+KKegEUlkb4bsVoAM/nm8yaWlmxVy5VsmFovKAnbJhy28=
 =BFNW
 -----END PGP SIGNATURE-----

Merge tag 'media/v6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fix from Mauro Carvalho Chehab:

 - uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in
   uvc_parse_format

* tag 'media/v6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format
This commit is contained in:
Linus Torvalds 2024-11-20 14:05:34 -08:00
commit 70e8ef2d67
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/usb/uvc/uvc_driver.c
View File

@ -371,7 +371,7 @@ static int uvc_parse_format(struct uvc_device *dev,
* Parse the frame descriptors. Only uncompressed, MJPEG and frame
* based formats have frame descriptors.
*/
while (buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE &&
while (ftype && buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE &&
buffer[2] == ftype) {
unsigned int maxIntervalIndex;