From 94e5a951b42b636010f49b3792d73043582e7c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= <moinejf@free.fr>
Date: Sun, 25 Apr 2010 15:25:42 -0300
Subject: [PATCH] --- yaml --- r: 193063 b: refs/heads/master c:
 a85675316f24835ce0c3286ee3cb33fa2f24bca7 h: refs/heads/master i:   193061:
 5f7bfc04acb864958d4685dbf9518a69d5a4e283   193059:
 85480e8634f1e7c2999eb3546eecddb5b820a34d   193055:
 aecb8e768a50e32380cf300f52b6ba637c1ac66d v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/media/video/gspca/zc3xx.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9c237850b1b4..8a9b29cbfa3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07ae4918f75f26f4f4200de186a27178c7e58038
+refs/heads/master: a85675316f24835ce0c3286ee3cb33fa2f24bca7
diff --git a/trunk/drivers/media/video/gspca/zc3xx.c b/trunk/drivers/media/video/gspca/zc3xx.c
index 1bab5086bada..d02aa5c8472a 100644
--- a/trunk/drivers/media/video/gspca/zc3xx.c
+++ b/trunk/drivers/media/video/gspca/zc3xx.c
@@ -6014,8 +6014,8 @@ static void setcontrast(struct gspca_dev *gspca_dev)
 	int g, i, k, adj, gp;
 	u8 gr[16];
 	static const u8 delta_tb[16] =		/* delta for contrast */
-		{0x15, 0x0d, 0x0a, 0x09, 0x08, 0x08, 0x08, 0x08,
-		 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08};
+		{0x2c, 0x1a, 0x12, 0x0c, 0x0a, 0x06, 0x06, 0x06,
+		 0x04, 0x06, 0x04, 0x04, 0x03, 0x03, 0x02, 0x02};
 	static const u8 gamma_tb[6][16] = {
 		{0x00, 0x00, 0x03, 0x0d, 0x1b, 0x2e, 0x45, 0x5f,
 		 0x79, 0x93, 0xab, 0xc1, 0xd4, 0xe5, 0xf3, 0xff},
@@ -6037,11 +6037,11 @@ static void setcontrast(struct gspca_dev *gspca_dev)
 	adj = 0;
 	gp = 0;
 	for (i = 0; i < 16; i++) {
-		g = Tgamma[i] - delta_tb[i] * k / 128 - adj / 2;
+		g = Tgamma[i] - delta_tb[i] * k / 256 - adj / 2;
 		if (g > 0xff)
 			g = 0xff;
-		else if (g <= 0)
-			g = 1;
+		else if (g < 0)
+			g = 0;
 		reg_w(dev, g, 0x0120 + i);	/* gamma */
 		if (k > 0)
 			adj--;