diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-05-08 16:16:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-06-01 00:21:27 -0400 |
commit | fa190ee91fcc3800f2c5d14810dc1b48a4b5d4e5 (patch) | |
tree | b26ae90757f6261856e8bb4fb6d176f73e5461c4 /drivers/media/video/pvrusb2 | |
parent | 31bf95fb5725013fd7d95d6d5b1e45f4c88b1f56 (diff) |
V4L/DVB: pvrusb2: 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/video/pvrusb2')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 2c3f845c3e5c..70ea578d6266 100644 --- 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) | |||
3069 | } | 3069 | } |
3070 | 3070 | ||
3071 | if (hdw->res_hor_dirty || hdw->res_ver_dirty || hdw->force_dirty) { | 3071 | if (hdw->res_hor_dirty || hdw->res_ver_dirty || hdw->force_dirty) { |
3072 | struct v4l2_format fmt; | 3072 | struct v4l2_mbus_framefmt fmt; |
3073 | memset(&fmt, 0, sizeof(fmt)); | 3073 | memset(&fmt, 0, sizeof(fmt)); |
3074 | fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; | 3074 | fmt.width = hdw->res_hor_val; |
3075 | fmt.fmt.pix.width = hdw->res_hor_val; | 3075 | fmt.height = hdw->res_ver_val; |
3076 | fmt.fmt.pix.height = hdw->res_ver_val; | 3076 | fmt.code = V4L2_MBUS_FMT_FIXED; |
3077 | pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_size(%dx%d)", | 3077 | pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_size(%dx%d)", |
3078 | fmt.fmt.pix.width, fmt.fmt.pix.height); | 3078 | fmt.width, fmt.height); |
3079 | v4l2_device_call_all(&hdw->v4l2_dev, 0, video, s_fmt, &fmt); | 3079 | v4l2_device_call_all(&hdw->v4l2_dev, 0, video, s_mbus_fmt, &fmt); |
3080 | } | 3080 | } |
3081 | 3081 | ||
3082 | if (hdw->srate_dirty || hdw->force_dirty) { | 3082 | if (hdw->srate_dirty || hdw->force_dirty) { |