diff --git a/[refs] b/[refs]
index d71cb98497af..b38f3b5d2de3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2330fb8242c3efc281ab8a2d3e22686023699955
+refs/heads/master: 82a7c049449ec5a2194249da341ec8bde14e968b
diff --git a/trunk/drivers/media/video/v4l2-ctrls.c b/trunk/drivers/media/video/v4l2-ctrls.c
index d084cea2b3ba..1bbaed6a5930 100644
--- a/trunk/drivers/media/video/v4l2-ctrls.c
+++ b/trunk/drivers/media/video/v4l2-ctrls.c
@@ -1264,6 +1264,7 @@ void v4l2_ctrl_auto_cluster(unsigned ncontrols, struct v4l2_ctrl **controls,
 
 	v4l2_ctrl_cluster(ncontrols, controls);
 	WARN_ON(ncontrols <= 1);
+	WARN_ON(manual_val < master->minimum || manual_val > master->maximum);
 	master->is_auto = true;
 	master->manual_mode_value = manual_val;
 	master->flags |= V4L2_CTRL_FLAG_UPDATE;
diff --git a/trunk/include/media/v4l2-ctrls.h b/trunk/include/media/v4l2-ctrls.h
index de68a59c7d84..8f08c6edf509 100644
--- a/trunk/include/media/v4l2-ctrls.h
+++ b/trunk/include/media/v4l2-ctrls.h
@@ -118,7 +118,7 @@ struct v4l2_ctrl {
 	unsigned int is_private:1;
 	unsigned int is_volatile:1;
 	unsigned int is_auto:1;
-	unsigned int manual_mode_value:5;
+	unsigned int manual_mode_value:8;
 
 	const struct v4l2_ctrl_ops *ops;
 	u32 id;