V4L/DVB: pvrusb2: convert to s_mbus_fmt

[~andy/linux] / drivers / media / video / pvrusb2 / pvrusb2-hdw.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 2c3f845c3e5c9ae79aa35b931df3ddf9b9127e07..70ea578d6266cfba9540417aa63ced74ab45d2a4 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -3069,14 +3069,14 @@ static void pvr2_subdev_update(struct pvr2_hdw *hdw)
        }
 
        if (hdw->res_hor_dirty || hdw->res_ver_dirty || hdw->force_dirty) {
-               struct v4l2_format fmt;
+               struct v4l2_mbus_framefmt fmt;
                memset(&fmt, 0, sizeof(fmt));
-               fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-               fmt.fmt.pix.width = hdw->res_hor_val;
-               fmt.fmt.pix.height = hdw->res_ver_val;
+               fmt.width = hdw->res_hor_val;
+               fmt.height = hdw->res_ver_val;
+               fmt.code = V4L2_MBUS_FMT_FIXED;
                pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_size(%dx%d)",
-                          fmt.fmt.pix.width, fmt.fmt.pix.height);
-               v4l2_device_call_all(&hdw->v4l2_dev, 0, video, s_fmt, &fmt);
+                          fmt.width, fmt.height);
+               v4l2_device_call_all(&hdw->v4l2_dev, 0, video, s_mbus_fmt, &fmt);
        }
 
        if (hdw->srate_dirty || hdw->force_dirty) {