---

yaml --- r: 271797 b: refs/heads/master c: 822f6e2 h: refs/heads/master i: 271795: 1977717 v: v3
git-mirror · Sep 11, 2011 · 05a893a · 05a893a
1 parent 0c78ec8
commit 05a893a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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: