]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] go7007: improve subscribe event handling
authorGustavo Padovan <gustavo.padovan@collabora.com>
Wed, 15 Feb 2017 17:55:33 +0000 (15:55 -0200)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 22 Mar 2017 13:12:21 +0000 (10:12 -0300)
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>
drivers/media/usb/go7007/go7007-v4l2.c

index 4eaba0c24629c93834f44e5f9caec855acffa1b3..ed5ec97739691dcf2bf7ed0bce1a573c0b0ec87e 100644 (file)
@@ -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;
 }