diff options
author | Gustavo Padovan <gustavo.padovan@collabora.com> | 2017-02-15 15:55:32 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-03-22 10:11:58 -0300 |
commit | cc0a5a867a6934e1a344a2e6b94dbcec7b9b457c (patch) | |
tree | 873b18bad458fda4c06c5dd016408eda9a250e3c /drivers/media/platform/vivid | |
parent | aac5987a54a25d243d3045d4ae33756a56498a5e (diff) | |
download | op-kernel-dev-cc0a5a867a6934e1a344a2e6b94dbcec7b9b457c.zip op-kernel-dev-cc0a5a867a6934e1a344a2e6b94dbcec7b9b457c.tar.gz |
[media] vivid: improve subscribe event handling
We already check for the V4L2_EVENT_CTRL inside
v4l2_ctrl_subscribe_event() so just move this fuction 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/platform/vivid')
-rw-r--r-- | drivers/media/platform/vivid/vivid-vid-out.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c index 7ba52ee..1a33730 100644 --- a/drivers/media/platform/vivid/vivid-vid-out.c +++ b/drivers/media/platform/vivid/vivid-vid-out.c @@ -1172,14 +1172,12 @@ int vidioc_subscribe_event(struct v4l2_fh *fh, const struct v4l2_event_subscription *sub) { switch (sub->type) { - case V4L2_EVENT_CTRL: - return v4l2_ctrl_subscribe_event(fh, sub); case V4L2_EVENT_SOURCE_CHANGE: if (fh->vdev->vfl_dir == VFL_DIR_RX) return v4l2_src_change_event_subscribe(fh, sub); break; default: - break; + return v4l2_ctrl_subscribe_event(fh, sub); } return -EINVAL; } |