From aecb8e768a50e32380cf300f52b6ba637c1ac66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= <moinejf@free.fr>
Date: Sun, 25 Apr 2010 14:23:39 -0300
Subject: [PATCH] --- yaml --- r: 193055 b: refs/heads/master c:
 bdd2b93c44bf70eac3c5ef7da62355e1e48ee1eb h: refs/heads/master i:   193053:
 6f7f12db9592a326e7011df62d41f3ee8b2f3969   193051:
 7be89c74c77b5e093b95a7683e579dbc6edd8c93   193047:
 bd2d5f17914ed652e7b5c92aab88a9f342815813   193039:
 979c23e7e92b71cc2e758db564de56d5b6a9db13   193023:
 d0e3a0d93bd3e461e49bd81d5986a0ddac238725 v: v3

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

diff --git a/[refs] b/[refs]
index 486841e037c6..b2bda5a73565 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96f2ec67b8d4761471409e1df0adfe4da5262f84
+refs/heads/master: bdd2b93c44bf70eac3c5ef7da62355e1e48ee1eb
diff --git a/trunk/drivers/media/video/gspca/sonixj.c b/trunk/drivers/media/video/gspca/sonixj.c
index d90c065a98ef..01c4a20b7873 100644
--- a/trunk/drivers/media/video/gspca/sonixj.c
+++ b/trunk/drivers/media/video/gspca/sonixj.c
@@ -878,7 +878,9 @@ static const u8 ov7630_sensor_init[][8] = {
 	{0xc1, 0x21, 0x7b, 0x00, 0x4c, 0xf7, 0x00, 0x10},
 	{0xd1, 0x21, 0x17, 0x1b, 0xbd, 0x05, 0xf6, 0x10},
 	{0xa1, 0x21, 0x1b, 0x04, 0x00, 0x00, 0x00, 0x10},
-/* */
+	{}
+};
+static const u8 ov7630_sensor_param1[][8] = {
 	{0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},
 	{0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},
 /*fixme: + 0x12, 0x04*/
@@ -2369,6 +2371,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 		reg17 = 0x64;		/* 640 MCKSIZE */
 		break;
 	case SENSOR_OV7630:
+		init = ov7630_sensor_param1;
 		reg17 = 0xe2;
 		reg1 = 0x44;
 		break;