These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / pci / cx18 / cx18-ioctl.c

diff --git a/kernel/drivers/media/pci/cx18/cx18-ioctl.c b/kernel/drivers/media/pci/cx18/cx18-ioctl.c
index 79aee30..55525af 100644 (file)
--- a/kernel/drivers/media/pci/cx18/cx18-ioctl.c
+++ b/kernel/drivers/media/pci/cx18/cx18-ioctl.c
@@ -267,7 +267,9 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
 {
        struct cx18_open_id *id = fh2id(fh);
        struct cx18 *cx = id->cx;
-       struct v4l2_mbus_framefmt mbus_fmt;
+       struct v4l2_subdev_format format = {
+               .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+       };
        struct cx18_stream *s = &cx->streams[id->type];
        int ret;
        int w, h;
@@ -296,10 +298,10 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
                s->vb_bytes_per_line = 1440; /* Packed */
        }
 
-       mbus_fmt.width = cx->cxhdl.width = w;
-       mbus_fmt.height = cx->cxhdl.height = h;
-       mbus_fmt.code = MEDIA_BUS_FMT_FIXED;
-       v4l2_subdev_call(cx->sd_av, video, s_mbus_fmt, &mbus_fmt);
+       format.format.width = cx->cxhdl.width = w;
+       format.format.height = cx->cxhdl.height = h;
+       format.format.code = MEDIA_BUS_FMT_FIXED;
+       v4l2_subdev_call(cx->sd_av, pad, set_fmt, NULL, &format);
        return cx18_g_fmt_vid_cap(file, fh, fmt);
 }