---

yaml --- r: 331139 b: refs/heads/master c: f67e157 h: refs/heads/master i: 331137: 60af600 331135: 15c8905 v: v3
git-mirror · Sep 26, 2012 · 75ed8d0 · 75ed8d0
1 parent 088b492
commit 75ed8d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53102d202fe9c0368f09055753a4ffa200fe4092
+refs/heads/master: f67e1573f08efb3225e7b1f05ecfec8b2ca8224b
diff --git a/trunk/drivers/media/i2c/smiapp/smiapp-core.c b/trunk/drivers/media/i2c/smiapp/smiapp-core.c
@@ -777,7 +777,11 @@ static int smiapp_get_mbus_formats(struct smiapp_sensor *sensor)
 			dev_dbg(&client->dev, "jolly good! %d\n", j);
 
 			sensor->default_mbus_frame_fmts |= 1 << j;
-			if (!sensor->csi_format) {
+			if (!sensor->csi_format
+			    || f->width > sensor->csi_format->width
+			    || (f->width == sensor->csi_format->width
+				&& f->compressed
+				> sensor->csi_format->compressed)) {
 				sensor->csi_format = f;
 				sensor->internal_csi_format = f;
 			}