diff --git a/[refs] b/[refs]
index 75535dcdd624..87988e5dcdf5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c32cc0c1f54d62c7e9ab81d1c1a3aa5b9efd73d
+refs/heads/master: ac829d62eeb5440899f0f034a9f756c2296105a5
diff --git a/trunk/drivers/media/video/tw9910.c b/trunk/drivers/media/video/tw9910.c
index 52c0357faa5d..8dc3ec79a06f 100644
--- a/trunk/drivers/media/video/tw9910.c
+++ b/trunk/drivers/media/video/tw9910.c
@@ -645,6 +645,19 @@ static int tw9910_set_fmt(struct soc_camera_device *icd, __u32 pixfmt,
 	struct tw9910_priv *priv = container_of(icd, struct tw9910_priv, icd);
 	int                 ret  = -EINVAL;
 	u8                  val;
+	int                 i;
+
+	/*
+	 * check color format
+	 */
+	for (i = 0 ; i < ARRAY_SIZE(tw9910_color_fmt) ; i++) {
+		if (pixfmt == tw9910_color_fmt[i].fourcc) {
+			ret = 0;
+			break;
+		}
+	}
+	if (ret < 0)
+		goto tw9910_set_fmt_error;
 
 	/*
 	 * select suitable norm