aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-05-09 09:09:28 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-06-01 00:21:28 -0400
commitcc99113b8cfb8b9685490db0b9bf0d26c9705ad3 (patch)
treeef0956a889400adc9c2302931f5167cbe37c1b2b /drivers/media/video
parentfa190ee91fcc3800f2c5d14810dc1b48a4b5d4e5 (diff)
V4L/DVB: cx23885: convert to s_mbus_fmt
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx23885/cx23885-video.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 543b854f6a6..4e44dcda387 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -976,6 +976,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
976{ 976{
977 struct cx23885_fh *fh = priv; 977 struct cx23885_fh *fh = priv;
978 struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev; 978 struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
979 struct v4l2_mbus_framefmt mbus_fmt;
979 int err; 980 int err;
980 981
981 dprintk(2, "%s()\n", __func__); 982 dprintk(2, "%s()\n", __func__);
@@ -989,7 +990,9 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
989 fh->vidq.field = f->fmt.pix.field; 990 fh->vidq.field = f->fmt.pix.field;
990 dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, 991 dprintk(2, "%s() width=%d height=%d field=%d\n", __func__,
991 fh->width, fh->height, fh->vidq.field); 992 fh->width, fh->height, fh->vidq.field);
992 call_all(dev, video, s_fmt, f); 993 v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);
994 call_all(dev, video, s_mbus_fmt, &mbus_fmt);
995 v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
993 return 0; 996 return 0;
994} 997}
995 998