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);