From 1328e823027bc3650443c3ff2ccf625a9fdf28c3 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 21 Mar 2012 08:03:24 -0300
Subject: [PATCH] --- yaml --- r: 306456 b: refs/heads/master c:
 4e0e620ce713893b2883522a16a71b5589e8e3db h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/soc_mediabus.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fe544f3cae2b..56597629ca53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad3b81faa1db60b2052f5f5a6ddae712f51b2dff
+refs/heads/master: 4e0e620ce713893b2883522a16a71b5589e8e3db
diff --git a/trunk/drivers/media/video/soc_mediabus.c b/trunk/drivers/media/video/soc_mediabus.c
index 44dba6c0f790..a7073142f9f1 100644
--- a/trunk/drivers/media/video/soc_mediabus.c
+++ b/trunk/drivers/media/video/soc_mediabus.c
@@ -378,6 +378,9 @@ EXPORT_SYMBOL(soc_mbus_samples_per_pixel);
 
 s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf)
 {
+	if (mf->layout != SOC_MBUS_LAYOUT_PACKED)
+		return width * mf->bits_per_sample / 8;
+
 	switch (mf->packing) {
 	case SOC_MBUS_PACKING_NONE:
 		return width * mf->bits_per_sample / 8;