aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/cx231xx/cx231xx-video.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-01-29 10:52:33 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-05 12:26:02 -0500
commitbc08734c825b710ffab93f79ca1ca2d0265dd321 (patch)
treef7ff90963340922a17cc3b02644cf982851bdf95 /drivers/media/usb/cx231xx/cx231xx-video.c
parent3f926e326d3c02b73898b7692f2b2306c521e2d3 (diff)
[media] cx231xx-417: use one querycap for all device nodes
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/cx231xx/cx231xx-video.c')
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-video.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index b6cde46131c7..c199eae6bd3e 100644
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -1632,7 +1632,7 @@ static int vidioc_streamoff(struct file *file, void *priv,
1632 return 0; 1632 return 0;
1633} 1633}
1634 1634
1635static int vidioc_querycap(struct file *file, void *priv, 1635int cx231xx_querycap(struct file *file, void *priv,
1636 struct v4l2_capability *cap) 1636 struct v4l2_capability *cap)
1637{ 1637{
1638 struct video_device *vdev = video_devdata(file); 1638 struct video_device *vdev = video_devdata(file);
@@ -2186,7 +2186,7 @@ static const struct v4l2_file_operations cx231xx_v4l_fops = {
2186}; 2186};
2187 2187
2188static const struct v4l2_ioctl_ops video_ioctl_ops = { 2188static const struct v4l2_ioctl_ops video_ioctl_ops = {
2189 .vidioc_querycap = vidioc_querycap, 2189 .vidioc_querycap = cx231xx_querycap,
2190 .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, 2190 .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
2191 .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, 2191 .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
2192 .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, 2192 .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
@@ -2237,7 +2237,7 @@ static const struct v4l2_file_operations radio_fops = {
2237}; 2237};
2238 2238
2239static const struct v4l2_ioctl_ops radio_ioctl_ops = { 2239static const struct v4l2_ioctl_ops radio_ioctl_ops = {
2240 .vidioc_querycap = vidioc_querycap, 2240 .vidioc_querycap = cx231xx_querycap,
2241 .vidioc_g_tuner = radio_g_tuner, 2241 .vidioc_g_tuner = radio_g_tuner,
2242 .vidioc_s_tuner = radio_s_tuner, 2242 .vidioc_s_tuner = radio_s_tuner,
2243 .vidioc_g_frequency = vidioc_g_frequency, 2243 .vidioc_g_frequency = vidioc_g_frequency,