From 67675aff5f78c131f9f522d916f3493efb7f10f0 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: 263722 b: refs/heads/master c:
 5b5cfc3674756d249cb389bbd2a0be94abae5f7c h: refs/heads/master 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 5ca1c621f002..60e5ebb448a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 313c68e644326e88731f03371baa8b5f3d68ef11
+refs/heads/master: 5b5cfc3674756d249cb389bbd2a0be94abae5f7c
diff --git a/trunk/drivers/media/video/gspca/sonixj.c b/trunk/drivers/media/video/gspca/sonixj.c
index 2ad757dc2e1c..c477ad11f103 100644
--- a/trunk/drivers/media/video/gspca/sonixj.c
+++ b/trunk/drivers/media/video/gspca/sonixj.c
@@ -2532,6 +2532,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: