From 05a893a8268b4bde2f1b51eb7d3149f8a82083c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= <moinejf@free.fr>
Date: Tue, 9 Aug 2011 15:13:50 -0300
Subject: [PATCH] --- yaml --- r: 271797 b: refs/heads/master c:
 822f6e2a9a41d3fea094591bf8cc227e12f5cb8f h: refs/heads/master i:   271795:
 1977717cf35180b5f33a3d3654e46cd66c4de0f8 v: v3

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

diff --git a/[refs] b/[refs]
index 44c3f9ab4435..1e01596ece25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72a16e8c7a9ba02a2e63c8c21bb055f4a33abc49
+refs/heads/master: 822f6e2a9a41d3fea094591bf8cc227e12f5cb8f
diff --git a/trunk/drivers/media/video/gspca/sonixj.c b/trunk/drivers/media/video/gspca/sonixj.c
index 816008fe5bfa..f3cfb9788aa5 100644
--- a/trunk/drivers/media/video/gspca/sonixj.c
+++ b/trunk/drivers/media/video/gspca/sonixj.c
@@ -2534,6 +2534,10 @@ static int sd_start(struct gspca_dev *gspca_dev)
 		if (!mode) {			/* if 640x480 */
 			reg17 &= ~MCK_SIZE_MASK;
 			reg17 |= 0x04;		/* clock / 4 */
+		} else {
+			reg01 &= ~SYS_SEL_48M;	/* clk 24Mz */
+			reg17 &= ~MCK_SIZE_MASK;
+			reg17 |= 0x02;		/* clock / 2 */
 		}
 		break;
 	case SENSOR_OV7630: