diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-05-08 17:16:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-06-01 01:21:27 -0300 |
| commit | fa190ee91fcc3800f2c5d14810dc1b48a4b5d4e5 (patch) | |
| tree | b26ae90757f6261856e8bb4fb6d176f73e5461c4 /drivers/media/video | |
| parent | 31bf95fb5725013fd7d95d6d5b1e45f4c88b1f56 (diff) | |
| download | kernel_samsung_smdk4412-fa190ee91fcc3800f2c5d14810dc1b48a4b5d4e5.zip kernel_samsung_smdk4412-fa190ee91fcc3800f2c5d14810dc1b48a4b5d4e5.tar.gz kernel_samsung_smdk4412-fa190ee91fcc3800f2c5d14810dc1b48a4b5d4e5.tar.bz2 | |
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')
| -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 2c3f845..70ea578 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) } 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) { |