summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/go7007
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.com>2017-02-15 18:55:33 +0100
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-03-22 14:12:21 +0100
commitc3d173a396c2700cb1ba02744fdc112f461f8177 (patch)
tree09e7611e8c4e12aee54cdffbacbc0b61703a389e /drivers/media/usb/go7007
parent[media] vivid: improve subscribe event handling (diff)
downloadlinux-c3d173a396c2700cb1ba02744fdc112f461f8177.tar.xz
linux-c3d173a396c2700cb1ba02744fdc112f461f8177.zip
[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>
Diffstat (limited to 'drivers/media/usb/go7007')
-rw-r--r--drivers/media/usb/go7007/go7007-v4l2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/usb/go7007/go7007-v4l2.c b/drivers/media/usb/go7007/go7007-v4l2.c
index 4eaba0c24629..ed5ec9773969 100644
--- a/drivers/media/usb/go7007/go7007-v4l2.c
+++ b/drivers/media/usb/go7007/go7007-v4l2.c
@@ -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;
}