From 2dc6c70e8dbc0b907086eb59e68f07f9fca189e0 Mon Sep 17 00:00:00 2001
From: Sensoray Linux Development <linux-dev@sensoray.com>
Date: Mon, 4 Apr 2011 15:16:26 -0300
Subject: [PATCH] --- yaml --- r: 250210 b: refs/heads/master c:
 d0ef8540f211ba7cde748ef4f0272cd49bfdb520 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/media/video/s2255drv.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index da47d8c70d2f..9744be6d34aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b01ff50035844bf2abac4a7e27b662a92ebb1d7b
+refs/heads/master: d0ef8540f211ba7cde748ef4f0272cd49bfdb520
diff --git a/trunk/drivers/media/video/s2255drv.c b/trunk/drivers/media/video/s2255drv.c
index 01a98c0d3950..46506d8381a2 100644
--- a/trunk/drivers/media/video/s2255drv.c
+++ b/trunk/drivers/media/video/s2255drv.c
@@ -432,6 +432,10 @@ static const struct s2255_fmt formats[] = {
 		.name = "JPG",
 		.fourcc = V4L2_PIX_FMT_JPEG,
 		.depth = 24
+	}, {
+		.name = "MJPG",
+		.fourcc = V4L2_PIX_FMT_MJPEG,
+		.depth = 24
 	}, {
 		.name = "8bpp GREY",
 		.fourcc = V4L2_PIX_FMT_GREY,
@@ -653,6 +657,7 @@ static void s2255_fillbuff(struct s2255_channel *channel,
 			memcpy(vbuf, tmpbuf, buf->vb.width * buf->vb.height);
 			break;
 		case V4L2_PIX_FMT_JPEG:
+		case V4L2_PIX_FMT_MJPEG:
 			buf->vb.size = jpgsize;
 			memcpy(vbuf, tmpbuf, buf->vb.size);
 			break;
@@ -1037,6 +1042,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
 		mode.color |= COLOR_Y8;
 		break;
 	case V4L2_PIX_FMT_JPEG:
+	case V4L2_PIX_FMT_MJPEG:
 		mode.color &= ~MASK_COLOR;
 		mode.color |= COLOR_JPG;
 		mode.color |= (channel->jc.quality << 8);