diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-06-03 04:36:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 08:33:49 -0400 |
commit | d31e545b00057516eac84ff0e2675bf802c2a522 (patch) | |
tree | 223f2a77c3e952a4c7807fb16c9a794d6e0a0ea2 /drivers/media/platform | |
parent | 8c84ac51df883eee994913a33be888553e821005 (diff) |
[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')
-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) | |||
837 | return 0; | 837 | return 0; |
838 | } | 838 | } |
839 | 839 | ||
840 | static int viacam_g_std(struct file *filp, void *priv, v4l2_std_id *std) | ||
841 | { | ||
842 | *std = V4L2_STD_NTSC_M; | ||
843 | return 0; | ||
844 | } | ||
845 | |||
840 | /* | 846 | /* |
841 | * Video format stuff. Here is our default format until | 847 | * Video format stuff. Here is our default format until |
842 | * user space messes with things. | 848 | * user space messes with things. |
@@ -1163,6 +1169,7 @@ static const struct v4l2_ioctl_ops viacam_ioctl_ops = { | |||
1163 | .vidioc_g_input = viacam_g_input, | 1169 | .vidioc_g_input = viacam_g_input, |
1164 | .vidioc_s_input = viacam_s_input, | 1170 | .vidioc_s_input = viacam_s_input, |
1165 | .vidioc_s_std = viacam_s_std, | 1171 | .vidioc_s_std = viacam_s_std, |
1172 | .vidioc_g_std = viacam_g_std, | ||
1166 | .vidioc_enum_fmt_vid_cap = viacam_enum_fmt_vid_cap, | 1173 | .vidioc_enum_fmt_vid_cap = viacam_enum_fmt_vid_cap, |
1167 | .vidioc_try_fmt_vid_cap = viacam_try_fmt_vid_cap, | 1174 | .vidioc_try_fmt_vid_cap = viacam_try_fmt_vid_cap, |
1168 | .vidioc_g_fmt_vid_cap = viacam_g_fmt_vid_cap, | 1175 | .vidioc_g_fmt_vid_cap = viacam_g_fmt_vid_cap, |
@@ -1250,7 +1257,6 @@ static struct video_device viacam_v4l_template = { | |||
1250 | .name = "via-camera", | 1257 | .name = "via-camera", |
1251 | .minor = -1, | 1258 | .minor = -1, |
1252 | .tvnorms = V4L2_STD_NTSC_M, | 1259 | .tvnorms = V4L2_STD_NTSC_M, |
1253 | .current_norm = V4L2_STD_NTSC_M, | ||
1254 | .fops = &viacam_fops, | 1260 | .fops = &viacam_fops, |
1255 | .ioctl_ops = &viacam_ioctl_ops, | 1261 | .ioctl_ops = &viacam_ioctl_ops, |
1256 | .release = video_device_release_empty, /* Check this */ | 1262 | .release = video_device_release_empty, /* Check this */ |