Skip to content

Commit 70e8ef2

Browse files
committed
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
2 parents 9f5a6a1 + ecf2b43 commit 70e8ef2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/media/usb/uvc/uvc_driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ static int uvc_parse_format(struct uvc_device *dev,
371371
* Parse the frame descriptors. Only uncompressed, MJPEG and frame
372372
* based formats have frame descriptors.
373373
*/
374-
while (buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE &&
374+
while (ftype && buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE &&
375375
buffer[2] == ftype) {
376376
unsigned int maxIntervalIndex;
377377

0 commit comments

Comments
 (0)