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

Commit 042e143e authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (12184): uvcvideo: Use class-specific descriptor types from usb/ch9.h 



uvcvideo.h redefines class-specific descriptor types already present in
usb/ch9.h. Remove the duplicated definitions and use the ones from usb/ch9.h.

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

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 && _buffer[1] == CS_INTERFACE) {

	while (_buflen > 2 && _buffer[1] == USB_DT_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 && buffer[1] == CS_INTERFACE) {

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

		switch (buffer[2]) {

		case VS_FORMAT_UNCOMPRESSED:

		case VS_FORMAT_MJPEG:

drivers/media/video/uvc/uvcvideo.h

+0 −7
Original line number Diff line number Diff line
@@ -79,13 +79,6 @@ struct uvc_xu_control { 


#define PC_PROTOCOL_UNDEFINED		0x00



#define CS_UNDEFINED			0x20

#define CS_DEVICE			0x21

#define CS_CONFIGURATION		0x22

#define CS_STRING			0x23

#define CS_INTERFACE			0x24

#define CS_ENDPOINT			0x25



/* VideoControl class specific interface descriptor */

#define VC_DESCRIPTOR_UNDEFINED		0x00

#define VC_HEADER			0x01