From ac24ea38806b8d4795985d07e21b5620388e0071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= <moinejf@free.fr>
Date: Wed, 10 Aug 2011 05:13:45 -0300
Subject: [PATCH] --- yaml --- r: 271799 b: refs/heads/master c:
 abe8cee744aa8aa29a2d88b915a17f0c7744aa3a h: refs/heads/master i:   271797:
 05a893a8268b4bde2f1b51eb7d3149f8a82083c8   271795:
 1977717cf35180b5f33a3d3654e46cd66c4de0f8   271791:
 e051b5464a77a4b2e809ef7e548109fc4bc3cbae v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/gspca/sonixj.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d273805c6f7a..7a4e0acf01c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d84a179b1f8c473ae7557d9f227c25771cc63c7
+refs/heads/master: abe8cee744aa8aa29a2d88b915a17f0c7744aa3a
diff --git a/trunk/drivers/media/video/gspca/sonixj.c b/trunk/drivers/media/video/gspca/sonixj.c
index f3cfb9788aa5..7ab0c1a7623d 100644
--- a/trunk/drivers/media/video/gspca/sonixj.c
+++ b/trunk/drivers/media/video/gspca/sonixj.c
@@ -159,7 +159,7 @@ static const struct ctrl sd_ctrls[NCTRLS] = {
 #define CONTRAST_MAX 127
 		.maximum = CONTRAST_MAX,
 		.step    = 1,
-		.default_value = 63,
+		.default_value = 20,
 	    },
 	    .set_control = setcontrast
 	},
@@ -2021,13 +2021,13 @@ static void setcontrast(struct gspca_dev *gspca_dev)
 	u8 k2;
 	u8 contrast[6];
 
-	k2 = sd->ctrls[CONTRAST].val * 0x30 / (CONTRAST_MAX + 1)
-				+ 0x10;		/* 10..40 */
+	k2 = sd->ctrls[CONTRAST].val * 37 / (CONTRAST_MAX + 1)
+				+ 37;		/* 37..73 */
 	contrast[0] = (k2 + 1) / 2;		/* red */
 	contrast[1] = 0;
 	contrast[2] = k2;			/* green */
 	contrast[3] = 0;
-	contrast[4] = (k2 + 1) / 5;		/* blue */
+	contrast[4] = k2 / 5;			/* blue */
 	contrast[5] = 0;
 	reg_w(gspca_dev, 0x84, contrast, sizeof contrast);
 }