From 6c982540e8b13cc25cd319456618ae2d3deae7b7 Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf@free.fr>
Date: Wed, 3 Sep 2008 16:48:01 -0300
Subject: [PATCH] --- yaml --- r: 109533 b: refs/heads/master c:
 d55b83d3c4558d0d118bf20ef3f1fa65b1c75c3d h: refs/heads/master i:   109531:
 8dc2ee1bb634b4b10d3e99c8cb7d82c481511917 v: v3

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

diff --git a/[refs] b/[refs]
index e8bf27c3b44a..962ea43f4247 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05b809c702bf297690c63ea78ee117c4dc909028
+refs/heads/master: d55b83d3c4558d0d118bf20ef3f1fa65b1c75c3d
diff --git a/trunk/drivers/media/video/gspca/sonixj.c b/trunk/drivers/media/video/gspca/sonixj.c
index b17aaa45270f..c34e02dccd5c 100644
--- a/trunk/drivers/media/video/gspca/sonixj.c
+++ b/trunk/drivers/media/video/gspca/sonixj.c
@@ -794,7 +794,7 @@ static int configure_gpio(struct gspca_dev *gspca_dev,
 
 	switch (sd->sensor) {
 	case SENSOR_OM6802:
-		reg_w1(gspca_dev, 0x02, 0x71);
+		reg_w1(gspca_dev, 0x02, 0x73);		/* was 71 */
 		reg_w1(gspca_dev, 0x01, 0x42);
 		reg_w1(gspca_dev, 0x17, 0x64);
 		reg_w1(gspca_dev, 0x01, 0x42);
@@ -1056,7 +1056,7 @@ static unsigned int setexposure(struct gspca_dev *gspca_dev,
 			expo = 0x0001;
 		gainOm[3] = expo >> 2;
 		i2c_w8(gspca_dev, gainOm);
-		reg_w1(gspca_dev, 0x96, expo >> 5);
+		reg_w1(gspca_dev, 0x96, (expo >> 5) & 0x1f);
 		PDEBUG(D_CONF, "set exposure %d", gainOm[3]);
 		break;
 	    }
@@ -1138,11 +1138,13 @@ static void setcolors(struct gspca_dev *gspca_dev)
 	int colour;
 
 	colour = sd->colors - 128;
-	if (colour > 0)
+	if (colour > 0) {
 		data = (colour + 32) & 0x7f;	/* blue */
-	else
+		reg_w1(gspca_dev, 0x06, data);
+	} else {
 		data = (-colour + 32) & 0x7f;	/* red */
-	reg_w1(gspca_dev, 0x05, data);
+		reg_w1(gspca_dev, 0x05, data);
+	}
 }
 
 static void setautogain(struct gspca_dev *gspca_dev)