---

yaml --- r: 124369 b: refs/heads/master c: daa5cb4 h: refs/heads/master i: 124367: 3f7940a v: v3
git-mirror · Dec 30, 2008 · c093097 · c093097
1 parent 9e3afe9
commit c093097
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd088835c78bd402711b16940b80bb761a74fa75
+refs/heads/master: daa5cb42f12684173e2cfd7d062527ca24916791
diff --git a/trunk/drivers/media/video/gspca/sonixj.c b/trunk/drivers/media/video/gspca/sonixj.c
@@ -1373,19 +1373,15 @@ static int sd_start(struct gspca_dev *gspca_dev)
 	default:
 /*	case SENSOR_OV7660: */
 		ov7660_InitSensor(gspca_dev);
-		if (mode) {
-/*			reg17 = 0x21;	 * 320 */
-/*			reg1 = 0x44; */
-/*			reg1 = 0x46;	(done) */
-		} else {			/* 640 */
-			if (sd->bridge == BRIDGE_SN9C120) {
+		if (sd->bridge == BRIDGE_SN9C120) {
+			if (mode) {		/* 320x240 - 160x120 */
 				reg17 = 0xa2;
 				reg1 = 0x44;	/* 48 Mhz, video trf eneble */
-			} else {
-				reg17 = 0x22;
-				reg1 = 0x06;	/* 24 Mhz, video trf eneble
-						 * inverse power down */
 			}
+		} else {
+			reg17 = 0x22;
+			reg1 = 0x06;	/* 24 Mhz, video trf eneble
+					 * inverse power down */
 		}
 		break;
 	}