aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx25840
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-05-01 15:07:04 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:58:52 -0400
commitaae6e33f8df8845603880468624ca29edf4bac64 (patch)
tree6744783468f29dfb5afabe3fc5cd82776a596992 /drivers/media/video/cx25840
parent4a61ecbd344c2349ec3b7a8db0db128135285dd7 (diff)
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/cx25840')
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index a20df8c184ed..8b6fb3544376 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -1079,12 +1079,6 @@ static int cx25840_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
1079 cx25840_write(client, 0x41e, 0x8 | filter); 1079 cx25840_write(client, 0x41e, 0x8 | filter);
1080 break; 1080 break;
1081 1081
1082 case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
1083 return cx25840_s_sliced_fmt(sd, &fmt->fmt.sliced);
1084
1085 case V4L2_BUF_TYPE_VBI_CAPTURE:
1086 return cx25840_s_raw_fmt(sd, &fmt->fmt.vbi);
1087
1088 default: 1082 default:
1089 return -EINVAL; 1083 return -EINVAL;
1090 } 1084 }