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

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

media: uvcvideo: Provide sync and async uvc_ctrl_status_event 



commit d9c8763e61295be0a21dc04ad9c379d5d17c3d86 upstream.

Split the functionality of void uvc_ctrl_status_event_work in two, so it
can be called by functions outside interrupt context and not part of an
URB.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2b1c5145

drivers/media/usb/uvc/uvc_ctrl.c

+15 −10
Original line number Diff line number Diff line
@@ -1275,17 +1275,12 @@ static void uvc_ctrl_send_slave_event(struct uvc_video_chain *chain, 
	uvc_ctrl_send_event(chain, handle, ctrl, mapping, val, changes);

}



static void uvc_ctrl_status_event_work(struct work_struct *work)

void uvc_ctrl_status_event(struct uvc_video_chain *chain,

			   struct uvc_control *ctrl, const u8 *data)

{

	struct uvc_device *dev = container_of(work, struct uvc_device,

					      async_ctrl.work);

	struct uvc_ctrl_work *w = &dev->async_ctrl;

	struct uvc_video_chain *chain = w->chain;

	struct uvc_control_mapping *mapping;

	struct uvc_control *ctrl = w->ctrl;

	struct uvc_fh *handle;

	unsigned int i;

	int ret;



	mutex_lock(&chain->ctrl_mutex);
@@ -1293,7 +1288,7 @@ static void uvc_ctrl_status_event_work(struct work_struct *work) 
	ctrl->handle = NULL;



	list_for_each_entry(mapping, &ctrl->info.mappings, list) {

		s32 value = __uvc_ctrl_get_value(mapping, w->data);

		s32 value = __uvc_ctrl_get_value(mapping, data);



		/*

		 * handle may be NULL here if the device sends auto-update
@@ -1312,6 +1307,16 @@ static void uvc_ctrl_status_event_work(struct work_struct *work) 
	}



	mutex_unlock(&chain->ctrl_mutex);

}



static void uvc_ctrl_status_event_work(struct work_struct *work)

{

	struct uvc_device *dev = container_of(work, struct uvc_device,

					      async_ctrl.work);

	struct uvc_ctrl_work *w = &dev->async_ctrl;

	int ret;



	uvc_ctrl_status_event(w->chain, w->ctrl, w->data);



	/* Resubmit the URB. */

	w->urb->interval = dev->int_ep->desc.bInterval;
@@ -1321,7 +1326,7 @@ static void uvc_ctrl_status_event_work(struct work_struct *work) 
			   ret);

}



bool uvc_ctrl_status_event(struct urb *urb, struct uvc_video_chain *chain,

bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain,

				 struct uvc_control *ctrl, const u8 *data)

{

	struct uvc_device *dev = chain->dev;

drivers/media/usb/uvc/uvc_status.c

+2 −1
Original line number Diff line number Diff line
@@ -179,7 +179,8 @@ static bool uvc_event_control(struct urb *urb, 


	switch (status->bAttribute) {

	case UVC_CTRL_VALUE_CHANGE:

		return uvc_ctrl_status_event(urb, chain, ctrl, status->bValue);

		return uvc_ctrl_status_event_async(urb, chain, ctrl,

						   status->bValue);



	case UVC_CTRL_INFO_CHANGE:

	case UVC_CTRL_FAILURE_CHANGE:

drivers/media/usb/uvc/uvcvideo.h

+3 −1
Original line number Diff line number Diff line
@@ -833,7 +833,9 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain, 
int uvc_ctrl_init_device(struct uvc_device *dev);

void uvc_ctrl_cleanup_device(struct uvc_device *dev);

int uvc_ctrl_restore_values(struct uvc_device *dev);

bool uvc_ctrl_status_event(struct urb *urb, struct uvc_video_chain *chain,

bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain,

				 struct uvc_control *ctrl, const u8 *data);

void uvc_ctrl_status_event(struct uvc_video_chain *chain,

			   struct uvc_control *ctrl, const u8 *data);



int uvc_ctrl_begin(struct uvc_video_chain *chain);