From 07d4a850cd5a0fa25041defd4aeba1ffcb6678b5 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 25 Apr 2010 16:27:14 -0300 Subject: [PATCH] --- yaml --- r: 193107 b: refs/heads/master c: cf7a50eeb6f462a0b7d1619fcb27a727a2981769 h: refs/heads/master i: 193105: 6eee73be09ace105aeff6b33d8cc75a07dc03296 193103: 8e7b0abb2196435c84c6f5f4e466ea7fca464b28 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_ctrl.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 25b0ff055706..46c37aae12b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a90ef69c1f67319ddbba0170767c660c7fb5d4c9 +refs/heads/master: cf7a50eeb6f462a0b7d1619fcb27a727a2981769 diff --git a/trunk/drivers/media/video/uvc/uvc_ctrl.c b/trunk/drivers/media/video/uvc/uvc_ctrl.c index 2703c9524396..aa0720af07a0 100644 --- a/trunk/drivers/media/video/uvc/uvc_ctrl.c +++ b/trunk/drivers/media/video/uvc/uvc_ctrl.c @@ -1071,6 +1071,8 @@ int uvc_ctrl_set(struct uvc_video_chain *chain, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MAX)); step = mapping->get(mapping, UVC_GET_RES, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); + if (step == 0) + step = 1; xctrl->value = min + (xctrl->value - min + step/2) / step * step; xctrl->value = clamp(xctrl->value, min, max);