From 75ed8d0ffd773ae08eaf705b3971ee506c9e4785 Mon Sep 17 00:00:00 2001
From: Sakari Ailus <sakari.ailus@iki.fi>
Date: Sat, 15 Sep 2012 17:19:49 -0300
Subject: [PATCH] --- yaml --- r: 331139 b: refs/heads/master c:
 f67e1573f08efb3225e7b1f05ecfec8b2ca8224b h: refs/heads/master i:   331137:
 60af6007340b383ab5b6f2cc94a021b411008947   331135:
 15c8905f548f08189a3ef99132b540ea67056087 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/i2c/smiapp/smiapp-core.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index df527c27d9eb..de8630a8d6e1 100644
--- 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
index 4f1c8d6eb19a..02bfa4472e02 100644
--- 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;
 			}