Commit e95765e9 authored by Daniel Scally's avatar Daniel Scally Committed by Greg Kroah-Hartman
Browse files

usb: gadget: g_webcam: Send color matching descriptor per frame 



Currently the color matching descriptor is only sent across the wire
a single time, following the descriptors for each format and frame.
According to the UVC 1.5 Specification 3.9.2.6 ("Color Matching
Descriptors"):

"Only one instance is allowed for a given format and if present,
the Color Matching descriptor shall be placed following the Video
and Still Image Frame descriptors for that format".

Add another reference to the color matching descriptor after the
yuyv frames so that it's correctly transmitted for that format
too.

Fixes: a9914127 ("USB gadget: Webcam device")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarDaniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham@ideasonboard.com>
Link: https://lore.kernel.org/r/20221216160528.479094-1-dan.scally@ideasonboard.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85af23df

drivers/usb/gadget/legacy/webcam.c

+3 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ static const struct uvc_descriptor_header * const uvc_fs_streaming_cls[] = { 
	(const struct uvc_descriptor_header *) &uvc_format_yuv,

	(const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,

	(const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,

	(const struct uvc_descriptor_header *) &uvc_color_matching,

	(const struct uvc_descriptor_header *) &uvc_format_mjpg,

	(const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,

	(const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
@@ -305,6 +306,7 @@ static const struct uvc_descriptor_header * const uvc_hs_streaming_cls[] = { 
	(const struct uvc_descriptor_header *) &uvc_format_yuv,

	(const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,

	(const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,

	(const struct uvc_descriptor_header *) &uvc_color_matching,

	(const struct uvc_descriptor_header *) &uvc_format_mjpg,

	(const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,

	(const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
@@ -317,6 +319,7 @@ static const struct uvc_descriptor_header * const uvc_ss_streaming_cls[] = { 
	(const struct uvc_descriptor_header *) &uvc_format_yuv,

	(const struct uvc_descriptor_header *) &uvc_frame_yuv_360p,

	(const struct uvc_descriptor_header *) &uvc_frame_yuv_720p,

	(const struct uvc_descriptor_header *) &uvc_color_matching,

	(const struct uvc_descriptor_header *) &uvc_format_mjpg,

	(const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p,

	(const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,