Commit c3d173a3 authored Feb 15, 2017 by Gustavo Padovan Committed by Mauro Carvalho Chehab Mar 22, 2017

[media] go7007: improve subscribe event handling



We already check for the V4L2_EVENT_CTRL inside
v4l2_ctrl_subscribe_event() so just move this function to the default:
branch of the switch and let it does the job for us.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

parent cc0a5a86

drivers/media/usb/go7007/go7007-v4l2.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -792,14 +792,13 @@ static int vidioc_subscribe_event(struct v4l2_fh *fh,
		{

		switch (sub->type) {
		case V4L2_EVENT_CTRL:
		return v4l2_ctrl_subscribe_event(fh, sub);
		case V4L2_EVENT_MOTION_DET:
		/* Allow for up to 30 events (1 second for NTSC) to be
		* stored. */
		return v4l2_event_subscribe(fh, sub, 30, NULL);
		default:
		return v4l2_ctrl_subscribe_event(fh, sub);
		}
		return -EINVAL;
		}

Admin message