---

yaml --- r: 173944 b: refs/heads/master c: d76f975 h: refs/heads/master v: v3
git-mirror · Dec 5, 2009 · b542db7 · b542db7
1 parent afafc20
commit b542db7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 205260102c5cef4180982eec88aaeb6934faf214
+refs/heads/master: d76f975c574230fb00d07848d330e04d97e51475
diff --git a/trunk/drivers/media/video/gspca/mr97310a.c b/trunk/drivers/media/video/gspca/mr97310a.c
@@ -842,8 +842,9 @@ static void setexposure(struct gspca_dev *gspca_dev)
 		return;
 
 	if (sd->cam_type == CAM_TYPE_CIF && sd->sensor_type == 1) {
-		/* This cam does not like very low exposure settings */
-		exposure = (sd->exposure < 300) ? 300 : sd->exposure;
+		/* This cam does not like exposure settings > 300,
+		   so scale 0 - 4095 to 300 - 4095 */
+		exposure = (sd->exposure * 9267) / 10000 + 300;
 		sensor_write1(gspca_dev, 3, exposure >> 4);
 		sensor_write1(gspca_dev, 4, exposure & 0x0f);
 	} else {