aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-08-06 15:18:23 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:04:40 -0400
commitc5e76a6d2aecca761f57b7a40df79812fad7fb98 (patch)
tree0dee93b571e8fc978a631ca2bc0e425deef931c8
parentb8c75ed898408cc7ca599a20ce27c40c425bd143 (diff)
V4L/DVB: cx25821: convert to the mediabus API
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/cx25821/cx25821-video.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c
index 1d5e8796d383..6fff985358a6 100644
--- a/drivers/staging/cx25821/cx25821-video.c
+++ b/drivers/staging/cx25821/cx25821-video.c
@@ -993,6 +993,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
993{ 993{
994 struct cx25821_fh *fh = priv; 994 struct cx25821_fh *fh = priv;
995 struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev; 995 struct cx25821_dev *dev = ((struct cx25821_fh *)priv)->dev;
996 struct v4l2_mbus_framefmt mbus_fmt;
996 int err; 997 int err;
997 int pix_format = PIXEL_FRMT_422; 998 int pix_format = PIXEL_FRMT_422;
998 999
@@ -1039,7 +1040,8 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
1039 1040
1040 dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width, 1041 dprintk(2, "%s() width=%d height=%d field=%d\n", __func__, fh->width,
1041 fh->height, fh->vidq.field); 1042 fh->height, fh->vidq.field);
1042 cx25821_call_all(dev, video, s_fmt, f); 1043 v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);
1044 cx25821_call_all(dev, video, s_mbus_fmt, &mbus_fmt);
1043 1045
1044 return 0; 1046 return 0;
1045} 1047}