Skip to content

Commit

Permalink
[media] go7007: improve subscribe event handling
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
padovan authored and mchehab committed Mar 22, 2017
1 parent cc0a5a8 commit c3d173a
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/media/usb/go7007/go7007-v4l2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}


Expand Down

0 comments on commit c3d173a

Please sign in to comment.