From 6f28730feab9db103a23fe75d9bde9206b1f819e Mon Sep 17 00:00:00 2001
From: Albert Wang <twang13@marvell.com>
Date: Wed, 1 Aug 2012 02:45:41 -0300
Subject: [PATCH] --- yaml --- r: 322069 b: refs/heads/master c:
 991b3137f21e13db4711f313edbe67d49bed795b h: refs/heads/master i:   322067:
 51841ea54bc8bcb14a1f4262e74b947a7d8f71dc v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/soc_camera.c   | 3 ++-
 trunk/drivers/media/video/soc_mediabus.c | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 76ea935cd457..095d8ea31e25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad5b987031835b0ac3064ef12209282277dbae54
+refs/heads/master: 991b3137f21e13db4711f313edbe67d49bed795b
diff --git a/trunk/drivers/media/video/soc_camera.c b/trunk/drivers/media/video/soc_camera.c
index b03ffecb7438..1bde255e45df 100644
--- a/trunk/drivers/media/video/soc_camera.c
+++ b/trunk/drivers/media/video/soc_camera.c
@@ -171,7 +171,8 @@ static int soc_camera_try_fmt(struct soc_camera_device *icd,
 	dev_dbg(icd->pdev, "TRY_FMT(%c%c%c%c, %ux%u)\n",
 		pixfmtstr(pix->pixelformat), pix->width, pix->height);
 
-	if (!(ici->capabilities & SOCAM_HOST_CAP_STRIDE)) {
+	if (pix->pixelformat != V4L2_PIX_FMT_JPEG &&
+	    !(ici->capabilities & SOCAM_HOST_CAP_STRIDE)) {
 		pix->bytesperline = 0;
 		pix->sizeimage = 0;
 	}
diff --git a/trunk/drivers/media/video/soc_mediabus.c b/trunk/drivers/media/video/soc_mediabus.c
index 89dce097a827..a397812635d6 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->fourcc == V4L2_PIX_FMT_JPEG)
+		return 0;
+
 	if (mf->layout != SOC_MBUS_LAYOUT_PACKED)
 		return width * mf->bits_per_sample / 8;
 
@@ -400,6 +403,9 @@ EXPORT_SYMBOL(soc_mbus_bytes_per_line);
 s32 soc_mbus_image_size(const struct soc_mbus_pixelfmt *mf,
 			u32 bytes_per_line, u32 height)
 {
+	if (mf->fourcc == V4L2_PIX_FMT_JPEG)
+		return 0;
+
 	if (mf->layout == SOC_MBUS_LAYOUT_PACKED)
 		return bytes_per_line * height;