diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-05-09 09:11:01 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-06-01 00:21:30 -0400 |
commit | 112cb4a8a092a6338a0e2309aac134e502f2a489 (patch) | |
tree | 416d7642ca5e9653dc3578e4fba34f2a1058c2e6 /drivers/media | |
parent | cc99113b8cfb8b9685490db0b9bf0d26c9705ad3 (diff) |
V4L/DVB: cx231xx: 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')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-video.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c index 2782709b263f..e76014561aa7 100644 --- a/drivers/media/video/cx231xx/cx231xx-video.c +++ b/drivers/media/video/cx231xx/cx231xx-video.c | |||
@@ -993,6 +993,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, | |||
993 | struct cx231xx *dev = fh->dev; | 993 | struct cx231xx *dev = fh->dev; |
994 | int rc; | 994 | int rc; |
995 | struct cx231xx_fmt *fmt; | 995 | struct cx231xx_fmt *fmt; |
996 | struct v4l2_mbus_framefmt mbus_fmt; | ||
996 | 997 | ||
997 | rc = check_dev(dev); | 998 | rc = check_dev(dev); |
998 | if (rc < 0) | 999 | if (rc < 0) |
@@ -1026,7 +1027,9 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, | |||
1026 | dev->format = fmt; | 1027 | dev->format = fmt; |
1027 | get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale); | 1028 | get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale); |
1028 | 1029 | ||
1029 | call_all(dev, video, s_fmt, f); | 1030 | v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED); |
1031 | call_all(dev, video, s_mbus_fmt, &mbus_fmt); | ||
1032 | v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt); | ||
1030 | 1033 | ||
1031 | /* Set the correct alternate setting for this resolution */ | 1034 | /* Set the correct alternate setting for this resolution */ |
1032 | cx231xx_resolution_set(dev); | 1035 | cx231xx_resolution_set(dev); |