[media] solo6x10: improve subscribe event handling

We already check for the V4L2_EVENT_CTRL inside
v4l2_ctrl_subscribe_event() so just move the 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>
Acked-by: Andrey Utkin <andrey.utkin@corp.bluecherry.net>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 25a2137ab79952a20fb66fd16ac52f6f81f1c538..25f9f2ebff1da3ace2e4c1192ba83ec0fe66b2f3 100644 (file)
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -1140,14 +1140,13 @@ static int solo_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;
 }
 
 static const struct v4l2_file_operations solo_enc_fops = {