diff --git a/[refs] b/[refs]
index b300f9531c94..9f9cb501677a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b4c5b1f0582df9231e6e1093e504d7df3a062b9
+refs/heads/master: 717ecd2b9a71970698c04f34239c6a1e5d08fbc2
diff --git a/trunk/drivers/staging/tm6000/tm6000-core.c b/trunk/drivers/staging/tm6000/tm6000-core.c
index 179885a193e6..c4e1aeb0195b 100644
--- a/trunk/drivers/staging/tm6000/tm6000-core.c
+++ b/trunk/drivers/staging/tm6000/tm6000-core.c
@@ -140,12 +140,16 @@ int tm6000_get_reg16 (struct tm6000_core *dev, u8 req, u16 value, u16 index)
 
 void tm6000_set_fourcc_format(struct tm6000_core *dev)
 {
-	if (dev->fourcc==V4L2_PIX_FMT_UYVY) {
-		/* Sets driver to UYUV */
-		tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0xd0);
+	if (dev->dev_type == TM6010) {
+		if (dev->fourcc == V4L2_PIX_FMT_UYVY)
+			tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0xfc);
+		else
+			tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0xfd);
 	} else {
-		/* Sets driver to YUV2 */
-		tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0x90);
+		if (dev->fourcc == V4L2_PIX_FMT_UYVY)
+			tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0xd0);
+		else
+			tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xc1, 0x90);
 	}
 }