]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
V4L/DVB: cx231xx: convert to s_mbus_fmt
authorHans Verkuil <hverkuil@xs4all.nl>
Sun, 9 May 2010 13:11:01 +0000 (10:11 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 1 Jun 2010 04:21:30 +0000 (01:21 -0300)
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/cx231xx/cx231xx-video.c

index 2782709b263fa49a7ed72f7a0f5eef9887111b60..e76014561aa782d0a22b725f079dadb2ef03bf58 100644 (file)
@@ -993,6 +993,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
        struct cx231xx *dev = fh->dev;
        int rc;
        struct cx231xx_fmt *fmt;
+       struct v4l2_mbus_framefmt mbus_fmt;
 
        rc = check_dev(dev);
        if (rc < 0)
@@ -1026,7 +1027,9 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
        dev->format = fmt;
        get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);
 
-       call_all(dev, video, s_fmt, f);
+       v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);
+       call_all(dev, video, s_mbus_fmt, &mbus_fmt);
+       v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
 
        /* Set the correct alternate setting for this resolution */
        cx231xx_resolution_set(dev);