[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>

diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c
index 7ba52ee98371c78ec2cc17554accc403c58e58d0..1a337306095452e493a0eb05d864557690fdc026 100644 (file)
--- 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;
 }