lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (4584): Fix VIDIOC_S_FMT min/max check in pvrusb2

Browse Source 
Acked-by: Mike Isely <isely@pobox.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil
2006-09-01 18:36:10 -03:00
committed by Mauro Carvalho Chehab
parent f2a49bc72b
commit b31e341be0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/video/pvrusb2/pvrusb2-v4l2.c
View File

@@ -468,18 +468,18 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
lmin = pvr2_ctrl_get_min(hcp); lmin = pvr2_ctrl_get_min(hcp);
lmax = pvr2_ctrl_get_max(hcp); lmax = pvr2_ctrl_get_max(hcp);
if (h < lmin) {
h = lmin;
} else if (h > lmax) {
h = lmax;
}
lmin = pvr2_ctrl_get_min(vcp);
lmax = pvr2_ctrl_get_max(vcp);
if (w < lmin) { if (w < lmin) {
w = lmin; w = lmin;
} else if (w > lmax) { } else if (w > lmax) {
w = lmax; w = lmax;
} }
lmin = pvr2_ctrl_get_min(vcp);
lmax = pvr2_ctrl_get_max(vcp);
if (h < lmin) {
h = lmin;
} else if (h > lmax) {
h = lmax;
}
memcpy(vf, &pvr_format[PVR_FORMAT_PIX], memcpy(vf, &pvr_format[PVR_FORMAT_PIX],
sizeof(struct v4l2_format)); sizeof(struct v4l2_format));