Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b27740c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11948): uvcvideo: Ignore non-UVC trailing interface descriptors. 



Herton Ronaldo Krzesinski from Mandriva reported that one Bison Electronics
webcam exposes a non-UVC interface descriptor. Instead of failing completely,
ignore trailing non-UVC descriptors and move on.

Thanks to Herton for reporting the problem and submitting a patch proposal.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ca4a3456

drivers/media/video/uvc/uvc_driver.c

+2 −2
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static int uvc_parse_streaming(struct uvc_device *dev, 
	_buflen = buflen;



	/* Count the format and frame descriptors. */

	while (_buflen > 2) {

	while (_buflen > 2 && _buffer[1] == CS_INTERFACE) {

		switch (_buffer[2]) {

		case VS_FORMAT_UNCOMPRESSED:

		case VS_FORMAT_MJPEG:
@@ -709,7 +709,7 @@ static int uvc_parse_streaming(struct uvc_device *dev, 
	streaming->nformats = nformats;



	/* Parse the format descriptors. */

	while (buflen > 2) {

	while (buflen > 2 && buffer[1] == CS_INTERFACE) {

		switch (buffer[2]) {

		case VS_FORMAT_UNCOMPRESSED:

		case VS_FORMAT_MJPEG: