aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7115.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-05-09 08:47:23 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-06-01 00:20:23 -0400
commitc463d93f22254f46168b49ad1149d1ec1e904711 (patch)
treedb8e67868b72c3496fd6513ea9aa294eebf03a72 /drivers/media/video/saa7115.c
parentf1158af2b2e064532470516943511863a873c5e5 (diff)
V4L/DVB: saa7115: add s_mbus_fmt op
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.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 53b6fcde3800..d4cc20859975 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1136,6 +1136,15 @@ static int saa711x_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
1136 return 0; 1136 return 0;
1137} 1137}
1138 1138
1139static int saa711x_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
1140{
1141 if (fmt->code != V4L2_MBUS_FMT_FIXED)
1142 return -EINVAL;
1143 fmt->field = V4L2_FIELD_INTERLACED;
1144 fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
1145 return saa711x_set_size(sd, fmt->width, fmt->height);
1146}
1147
1139static int saa711x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt) 1148static int saa711x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
1140{ 1149{
1141 if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) 1150 if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -1558,6 +1567,7 @@ static const struct v4l2_subdev_video_ops saa711x_video_ops = {
1558 .s_crystal_freq = saa711x_s_crystal_freq, 1567 .s_crystal_freq = saa711x_s_crystal_freq,
1559 .g_fmt = saa711x_g_fmt, 1568 .g_fmt = saa711x_g_fmt,
1560 .s_fmt = saa711x_s_fmt, 1569 .s_fmt = saa711x_s_fmt,
1570 .s_mbus_fmt = saa711x_s_mbus_fmt,
1561 .s_stream = saa711x_s_stream, 1571 .s_stream = saa711x_s_stream,
1562 .querystd = saa711x_querystd, 1572 .querystd = saa711x_querystd,
1563 .g_input_status = saa711x_g_input_status, 1573 .g_input_status = saa711x_g_input_status,