diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.com> | 2017-02-15 18:55:29 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-03-22 14:10:50 +0100 |
| commit | 88b172f9f9d42bd83b6e22473321bd2fd4052c47 (patch) | |
| tree | 74454feab9aef601ddff8d86002467dd873cf9de /drivers/media/pci | |
| parent | [media] vb2: only check ret if we assigned it (diff) | |
| download | linux-88b172f9f9d42bd83b6e22473321bd2fd4052c47.tar.xz linux-88b172f9f9d42bd83b6e22473321bd2fd4052c47.zip | |
[media] ivtv: improve subscribe_event handling
Simplify logic and call v4l2_ctrl_subscribe_event() directly instead
of copying its content over to ivtv_subscribe_event().
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/pci')
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-ioctl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c index f956188f7f19..670462d195b5 100644 --- a/drivers/media/pci/ivtv/ivtv-ioctl.c +++ b/drivers/media/pci/ivtv/ivtv-ioctl.c @@ -1506,10 +1506,8 @@ static int ivtv_subscribe_event(struct v4l2_fh *fh, const struct v4l2_event_subs case V4L2_EVENT_VSYNC: case V4L2_EVENT_EOS: return v4l2_event_subscribe(fh, sub, 0, NULL); - case V4L2_EVENT_CTRL: - return v4l2_event_subscribe(fh, sub, 0, &v4l2_ctrl_sub_ev_ops); default: - return -EINVAL; + return v4l2_ctrl_subscribe_event(fh, sub); } } |