summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7115.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-05-01 21:07:04 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 17:58:52 +0200
commitaae6e33f8df8845603880468624ca29edf4bac64 (patch)
tree6744783468f29dfb5afabe3fc5cd82776a596992 /drivers/media/video/saa7115.c
parentV4L/DVB: em28xx: switch to new vbi subdev ops (diff)
downloadlinux-aae6e33f8df8845603880468624ca29edf4bac64.tar.xz
linux-aae6e33f8df8845603880468624ca29edf4bac64.zip
V4L/DVB: cx18/cx25840/saa7115/tvp5150: remove vbi support from s_fmt
Now that s_fmt is no longer used for VBI format setup in subdevs, remove the VBI support from s_fmt. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7115.c')
-rw-r--r--drivers/media/video/saa7115.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index cf77318ede43..53b6fcde3800 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1138,10 +1138,6 @@ static int saa711x_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
static int saa711x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
{
- if (fmt->type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)
- return saa711x_s_sliced_fmt(sd, &fmt->fmt.sliced);
- if (fmt->type == V4L2_BUF_TYPE_VBI_CAPTURE)
- return saa711x_s_raw_fmt(sd, &fmt->fmt.vbi);
if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;