From 7e0a39ca611c7806979537da2318bcc3a8d6be06 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Wed, 26 Oct 2011 09:16:50 -0300
Subject: [PATCH] --- yaml --- r: 285167 b: refs/heads/master c:
 9c900f02385cb18e1a6c65d22a7acbb8c73c07c2 h: refs/heads/master i:   285165:
 e6a33c038e602f1096272cfc7227480d24c3ce63   285163:
 e2c41060816160e5dbab381efc212afb052589f3   285159:
 1a026d753e62165a52efb6b82edbac2b4eeb8adb   285151:
 ca73dc99644bd2ae8ea754634279eeb0f959cba6 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/media/video/via-camera.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a8b0da5bbf2d..e7dd7132e929 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 318cde38af41fefdd03a7e42c9fb70e9719ed83f
+refs/heads/master: 9c900f02385cb18e1a6c65d22a7acbb8c73c07c2
diff --git a/trunk/drivers/media/video/via-camera.c b/trunk/drivers/media/video/via-camera.c
index cbf13d09b4ac..6a828759e387 100644
--- a/trunk/drivers/media/video/via-camera.c
+++ b/trunk/drivers/media/video/via-camera.c
@@ -156,14 +156,10 @@ static struct via_format {
 		.mbus_code	= V4L2_MBUS_FMT_YUYV8_2X8,
 		.bpp		= 2,
 	},
-	{
-		.desc		= "RGB 565",
-		.pixelformat	= V4L2_PIX_FMT_RGB565,
-		.mbus_code	= V4L2_MBUS_FMT_RGB565_2X8_LE,
-		.bpp		= 2,
-	},
 	/* RGB444 and Bayer should be doable, but have never been
-	   tested with this driver. */
+	   tested with this driver. RGB565 seems to work at the default
+	   resolution, but results in color corruption when being scaled by
+	   viacam_set_scaled(), and is disabled as a result. */
 };
 #define N_VIA_FMTS ARRAY_SIZE(via_formats)