mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-11 15:49:56 +00:00
V4L/DVB (4584): Fix VIDIOC_S_FMT min/max check in pvrusb2
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:
parent
f2a49bc72b
commit
b31e341be0
@ -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));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user