diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-10-11 04:12:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-16 06:58:53 -0500 |
commit | aa07eec5320cf1793062c03b8409e7541ca37c31 (patch) | |
tree | cbfead55cd780cb44768c4a8c1f783df020d00c6 /drivers/media | |
parent | dacd4fa37dbafe209a90d6d5b729d2257df4b734 (diff) |
[media] v4l2-ioctl: make tuner 'type' check more strict for S_FREQUENCY
As per the feature removal document, make the tuner type check more strict
so that it is no longer possible to set the radio frequency through a video
node or the TV frequency through a radio node.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/v4l2-ioctl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index 77feeb67e2d..3f623859a33 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c | |||
@@ -1871,6 +1871,7 @@ static long __video_do_ioctl(struct file *file, | |||
1871 | case VIDIOC_S_FREQUENCY: | 1871 | case VIDIOC_S_FREQUENCY: |
1872 | { | 1872 | { |
1873 | struct v4l2_frequency *p = arg; | 1873 | struct v4l2_frequency *p = arg; |
1874 | enum v4l2_tuner_type type; | ||
1874 | 1875 | ||
1875 | if (!ops->vidioc_s_frequency) | 1876 | if (!ops->vidioc_s_frequency) |
1876 | break; | 1877 | break; |
@@ -1878,9 +1879,14 @@ static long __video_do_ioctl(struct file *file, | |||
1878 | ret = ret_prio; | 1879 | ret = ret_prio; |
1879 | break; | 1880 | break; |
1880 | } | 1881 | } |
1882 | type = (vfd->vfl_type == VFL_TYPE_RADIO) ? | ||
1883 | V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; | ||
1881 | dbgarg(cmd, "tuner=%d, type=%d, frequency=%d\n", | 1884 | dbgarg(cmd, "tuner=%d, type=%d, frequency=%d\n", |
1882 | p->tuner, p->type, p->frequency); | 1885 | p->tuner, p->type, p->frequency); |
1883 | ret = ops->vidioc_s_frequency(file, fh, p); | 1886 | if (p->type != type) |
1887 | ret = -EINVAL; | ||
1888 | else | ||
1889 | ret = ops->vidioc_s_frequency(file, fh, p); | ||
1884 | break; | 1890 | break; |
1885 | } | 1891 | } |
1886 | case VIDIOC_G_SLICED_VBI_CAP: | 1892 | case VIDIOC_G_SLICED_VBI_CAP: |