From 9426be48ec2b5064f58cff0fe8ae78896b991541 Mon Sep 17 00:00:00 2001
From: Patrice Chotard <patrice.chotard@sfr.fr>
Date: Mon, 18 Apr 2011 17:39:38 -0300
Subject: [PATCH] --- yaml --- r: 250156 b: refs/heads/master c:
 6f8efcfb3dc88e4c626765278afc40ed4bfc18e2 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/media/video/gspca/jeilinj.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a62af87af2fd..50857ad7f236 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8715b16eadef74e9cf167f44961354f54b547e2a
+refs/heads/master: 6f8efcfb3dc88e4c626765278afc40ed4bfc18e2
diff --git a/trunk/drivers/media/video/gspca/jeilinj.c b/trunk/drivers/media/video/gspca/jeilinj.c
index 32494fbf1cf1..51b68dbdcdb5 100644
--- a/trunk/drivers/media/video/gspca/jeilinj.c
+++ b/trunk/drivers/media/video/gspca/jeilinj.c
@@ -62,6 +62,11 @@ static struct v4l2_pix_format jlj_mode[] = {
 		.bytesperline = 320,
 		.sizeimage = 320 * 240,
 		.colorspace = V4L2_COLORSPACE_JPEG,
+		.priv = 0},
+	{ 640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+		.bytesperline = 640,
+		.sizeimage = 640 * 480,
+		.colorspace = V4L2_COLORSPACE_JPEG,
 		.priv = 0}
 };
 
@@ -207,7 +212,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
 		"JEILINJ camera detected"
 		" (vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
 	cam->cam_mode = jlj_mode;
-	cam->nmodes = 1;
+	cam->nmodes = ARRAY_SIZE(jlj_mode);
 	cam->bulk = 1;
 	cam->bulk_nurbs = 1;
 	cam->bulk_size = JEILINJ_MAX_TRANSFER;
@@ -264,7 +269,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
 	jpeg_define(dev->jpeg_hdr, gspca_dev->height, gspca_dev->width,
 			0x21);          /* JPEG 422 */
 	jpeg_set_qual(dev->jpeg_hdr, dev->quality);
-	PDEBUG(D_STREAM, "Start streaming at 320x240");
+	PDEBUG(D_STREAM, "Start streaming at %dx%d",
+		gspca_dev->height, gspca_dev->width);
 	jlj_start(gspca_dev);
 	return gspca_dev->usb_err;
 }