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

usb: gadget: uvc: Remove the hardcoded default color matching 



A hardcoded default color matching descriptor is embedded in struct
f_uvc_opts but no longer has any use - remove it.

Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Scally <dan.scally@ideasonboard.com>
Link: https://lore.kernel.org/r/20230202114142.300858-5-dan.scally@ideasonboard.com


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

drivers/usb/gadget/function/f_uvc.c

+0 −9
Original line number Diff line number Diff line
@@ -817,7 +817,6 @@ static struct usb_function_instance *uvc_alloc_inst(void) 
	struct uvc_camera_terminal_descriptor *cd;

	struct uvc_processing_unit_descriptor *pd;

	struct uvc_output_terminal_descriptor *od;

	struct uvc_color_matching_descriptor *md;

	struct uvc_descriptor_header **ctl_cls;

	int ret;
@@ -866,14 +865,6 @@ static struct usb_function_instance *uvc_alloc_inst(void) 
	od->bSourceID			= 2;

	od->iTerminal			= 0;



	md = &opts->uvc_color_matching;

	md->bLength			= UVC_DT_COLOR_MATCHING_SIZE;

	md->bDescriptorType		= USB_DT_CS_INTERFACE;

	md->bDescriptorSubType		= UVC_VS_COLORFORMAT;

	md->bColorPrimaries		= 1;

	md->bTransferCharacteristics	= 1;

	md->bMatrixCoefficients		= 4;



	/* Prepare fs control class descriptors for configfs-based gadgets */

	ctl_cls = opts->uvc_fs_control_cls;

	ctl_cls[0] = NULL;	/* assigned elsewhere by configfs */

drivers/usb/gadget/function/u_uvc.h

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ struct f_uvc_opts { 
	struct uvc_camera_terminal_descriptor		uvc_camera_terminal;

	struct uvc_processing_unit_descriptor		uvc_processing;

	struct uvc_output_terminal_descriptor		uvc_output_terminal;

	struct uvc_color_matching_descriptor		uvc_color_matching;



	/*

	 * Control descriptors pointers arrays for full-/high-speed and