From bbda964e3d996eb92432e8ee6966248dd903aad6 Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf@free.fr>
Date: Wed, 3 Sep 2008 16:48:03 -0300
Subject: [PATCH] --- yaml --- r: 109535 b: refs/heads/master c:
 759aa3c21ebbab6cc00fc4aebd09b3a7d63715d1 h: refs/heads/master i:   109533:
 6c982540e8b13cc25cd319456618ae2d3deae7b7   109531:
 8dc2ee1bb634b4b10d3e99c8cb7d82c481511917   109527:
 4e83fde765064cc2c6efa0842162165192bdd0ed   109519:
 7864b69667f9df60583a9d9413252ccf5fc3dc8e   109503:
 00be7dd28660926af2eb9e2cf39bc8ac3cdd12cf v: v3

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

diff --git a/[refs] b/[refs]
index d37176023036..37f97a666eae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a18625e88efef2b5a21695edcb2b21d98fdf71b
+refs/heads/master: 759aa3c21ebbab6cc00fc4aebd09b3a7d63715d1
diff --git a/trunk/drivers/media/video/gspca/sonixj.c b/trunk/drivers/media/video/gspca/sonixj.c
index c34e02dccd5c..6673a3edf190 100644
--- a/trunk/drivers/media/video/gspca/sonixj.c
+++ b/trunk/drivers/media/video/gspca/sonixj.c
@@ -59,7 +59,6 @@ struct sd {
 #define SENSOR_OV7648 5
 #define SENSOR_OV7660 6
 	unsigned char i2c_base;
-	__u8 regf1;
 };
 
 /* V4L2 controls supported by the driver */
@@ -929,7 +928,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
 	sd->bridge = id->driver_info >> 16;
 	sd->sensor = id->driver_info >> 8;
 	sd->i2c_base = id->driver_info;
-	sd->regf1 = 0;			/*jfm: was 1 in v1*/
 
 	sd->qindex = 4;			/* set the quantization table */
 	sd->brightness = BRIGHTNESS_DEF;
@@ -982,7 +980,7 @@ static int sd_open(struct gspca_dev *gspca_dev)
 		break;
 	}
 
-	reg_w1(gspca_dev, 0xf1, sd->regf1);
+	reg_w1(gspca_dev, 0xf1, 0x01);
 
 	return 0;
 }
@@ -1346,7 +1344,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
 	reg_w1(gspca_dev, 0x17, sn9c1xx[0x17]);
 	reg_w1(gspca_dev, 0x01, sn9c1xx[1]);
 	reg_w1(gspca_dev, 0x01, data);
-	reg_w1(gspca_dev, 0xf1, sd->regf1);
+	reg_w1(gspca_dev, 0xf1, 0x00);
 }
 
 static void sd_stop0(struct gspca_dev *gspca_dev)