mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-21 08:53:41 +00:00
[media] uvcvideo: Fix control value clamping for unsigned integer controls
V4L2 integer controls are stored in signed 32-bit values. However, UVC controls can be either signed or unsigned. Take the UVC control signedness into account when clamping the control value to the min-max range. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
8be8ec6ea5
commit
64ae9958a6
@ -1455,8 +1455,12 @@ int uvc_ctrl_set(struct uvc_video_chain *chain,
|
||||
if (step == 0)
|
||||
step = 1;
|
||||
|
||||
xctrl->value = min + (xctrl->value - min + step/2) / step * step;
|
||||
xctrl->value = clamp(xctrl->value, min, max);
|
||||
xctrl->value = min + ((u32)(xctrl->value - min) + step / 2)
|
||||
/ step * step;
|
||||
if (mapping->data_type == UVC_CTRL_DATA_TYPE_SIGNED)
|
||||
xctrl->value = clamp(xctrl->value, min, max);
|
||||
else
|
||||
xctrl->value = clamp_t(u32, xctrl->value, min, max);
|
||||
value = xctrl->value;
|
||||
break;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user