aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/jeilinj.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/jeilinj.c')
-rw-r--r--drivers/media/video/gspca/jeilinj.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/video/gspca/jeilinj.c
index 32494fbf1cf1..51b68dbdcdb5 100644
--- a/drivers/media/video/gspca/jeilinj.c
+++ b/drivers/media/video/gspca/jeilinj.c
@@ -62,6 +62,11 @@ static struct v4l2_pix_format jlj_mode[] = {
62 .bytesperline = 320, 62 .bytesperline = 320,
63 .sizeimage = 320 * 240, 63 .sizeimage = 320 * 240,
64 .colorspace = V4L2_COLORSPACE_JPEG, 64 .colorspace = V4L2_COLORSPACE_JPEG,
65 .priv = 0},
66 { 640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
67 .bytesperline = 640,
68 .sizeimage = 640 * 480,
69 .colorspace = V4L2_COLORSPACE_JPEG,
65 .priv = 0} 70 .priv = 0}
66}; 71};
67 72
@@ -207,7 +212,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
207 "JEILINJ camera detected" 212 "JEILINJ camera detected"
208 " (vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct); 213 " (vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
209 cam->cam_mode = jlj_mode; 214 cam->cam_mode = jlj_mode;
210 cam->nmodes = 1; 215 cam->nmodes = ARRAY_SIZE(jlj_mode);
211 cam->bulk = 1; 216 cam->bulk = 1;
212 cam->bulk_nurbs = 1; 217 cam->bulk_nurbs = 1;
213 cam->bulk_size = JEILINJ_MAX_TRANSFER; 218 cam->bulk_size = JEILINJ_MAX_TRANSFER;
@@ -264,7 +269,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
264 jpeg_define(dev->jpeg_hdr, gspca_dev->height, gspca_dev->width, 269 jpeg_define(dev->jpeg_hdr, gspca_dev->height, gspca_dev->width,
265 0x21); /* JPEG 422 */ 270 0x21); /* JPEG 422 */
266 jpeg_set_qual(dev->jpeg_hdr, dev->quality); 271 jpeg_set_qual(dev->jpeg_hdr, dev->quality);
267 PDEBUG(D_STREAM, "Start streaming at 320x240"); 272 PDEBUG(D_STREAM, "Start streaming at %dx%d",
273 gspca_dev->height, gspca_dev->width);
268 jlj_start(gspca_dev); 274 jlj_start(gspca_dev);
269 return gspca_dev->usb_err; 275 return gspca_dev->usb_err;
270} 276}