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

Commit c65fe17a authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Greg Kroah-Hartman
Browse files

media: uvcvideo: Allow entity-defined get_info and get_cur 



[ Upstream commit 65900c581d014499f0f8ceabfc02c652e9a88771 ]

Allows controls to get their properties and current value
from an entity-defined function instead of via a query to the USB
device.

Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Stable-dep-of: 86419686e66d ("media: uvcvideo: Override default flags")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f8bcdad2

drivers/media/usb/uvc/uvc_ctrl.c

+18 −4
Original line number Diff line number Diff line
@@ -1002,10 +1002,20 @@ static int __uvc_ctrl_get(struct uvc_video_chain *chain, 
		return -EACCES;



	if (!ctrl->loaded) {

		ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR, ctrl->entity->id,

				chain->dev->intfnum, ctrl->info.selector,

		if (ctrl->entity->get_cur) {

			ret = ctrl->entity->get_cur(chain->dev,

				ctrl->entity,

				ctrl->info.selector,

				uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT),

				ctrl->info.size);

		} else {

			ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR,

				ctrl->entity->id,

				chain->dev->intfnum,

				ctrl->info.selector,

				uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT),

				ctrl->info.size);

		}

		if (ret < 0)

			return ret;
@@ -1718,8 +1728,12 @@ static int uvc_ctrl_get_flags(struct uvc_device *dev, 
	if (data == NULL)

		return -ENOMEM;



	ret = uvc_query_ctrl(dev, UVC_GET_INFO, ctrl->entity->id, dev->intfnum,

			     info->selector, data, 1);

	if (ctrl->entity->get_info)

		ret = ctrl->entity->get_info(dev, ctrl->entity,

					     ctrl->info.selector, data);

	else

		ret = uvc_query_ctrl(dev, UVC_GET_INFO, ctrl->entity->id,

				     dev->intfnum, info->selector, data, 1);

	if (!ret)

		info->flags |= (data[0] & UVC_CONTROL_CAP_GET ?

				UVC_CTRL_FLAG_GET_CUR : 0)

drivers/media/usb/uvc/uvcvideo.h

+5 −0
Original line number Diff line number Diff line
@@ -350,6 +350,11 @@ struct uvc_entity { 
	u8 bNrInPins;

	u8 *baSourceID;



	int (*get_info)(struct uvc_device *dev, struct uvc_entity *entity,

			u8 cs, u8 *caps);

	int (*get_cur)(struct uvc_device *dev, struct uvc_entity *entity,

		       u8 cs, void *data, u16 size);



	unsigned int ncontrols;

	struct uvc_control *controls;

};