diff options
| author |   Hans Verkuil <hans.verkuil@cisco.com> | 2013-06-03 05:36:39 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 09:33:49 -0300 |
| commit | d31e545b00057516eac84ff0e2675bf802c2a522 (patch) | |
| tree | 223f2a77c3e952a4c7807fb16c9a794d6e0a0ea2 /drivers/media/platform/via-camera.c | |
| parent | [media] mcam-core: replace current_norm by g_std (diff) | |
| download | wireguard-linux-d31e545b00057516eac84ff0e2675bf802c2a522.tar.xz wireguard-linux-d31e545b00057516eac84ff0e2675bf802c2a522.zip | |
[media] via-camera: replace current_norm by g_std
The current_norm field is deprecated. Replace it by properly implementing
g_std.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/via-camera.c')
| -rw-r--r-- | drivers/media/platform/via-camera.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c index e3438277b80b..b4f9d03636e3 100644 --- a/drivers/media/platform/via-camera.c +++ b/drivers/media/platform/via-camera.c @@ -837,6 +837,12 @@ static int viacam_s_std(struct file *filp, void *priv, v4l2_std_id std) return 0; } +static int viacam_g_std(struct file *filp, void *priv, v4l2_std_id *std) +{ + *std = V4L2_STD_NTSC_M; + return 0; +} + /* * Video format stuff. Here is our default format until * user space messes with things. @@ -1163,6 +1169,7 @@ static const struct v4l2_ioctl_ops viacam_ioctl_ops = { .vidioc_g_input = viacam_g_input, .vidioc_s_input = viacam_s_input, .vidioc_s_std = viacam_s_std, + .vidioc_g_std = viacam_g_std, .vidioc_enum_fmt_vid_cap = viacam_enum_fmt_vid_cap, .vidioc_try_fmt_vid_cap = viacam_try_fmt_vid_cap, .vidioc_g_fmt_vid_cap = viacam_g_fmt_vid_cap, @@ -1250,7 +1257,6 @@ static struct video_device viacam_v4l_template = { .name = "via-camera", .minor = -1, .tvnorms = V4L2_STD_NTSC_M, - .current_norm = V4L2_STD_NTSC_M, .fops = &viacam_fops, .ioctl_ops = &viacam_ioctl_ops, .release = video_device_release_empty, /* Check this */ |