aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/gspca/sn9c20x.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index 4f8ad37ffa25..53ed0f7e0219 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -348,7 +348,7 @@ static const struct ctrl sd_ctrls[] = {
348static const struct v4l2_pix_format vga_mode[] = { 348static const struct v4l2_pix_format vga_mode[] = {
349 {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, 349 {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
350 .bytesperline = 160, 350 .bytesperline = 160,
351 .sizeimage = 240 * 120, 351 .sizeimage = 160 * 120 * 4 / 8 + 590,
352 .colorspace = V4L2_COLORSPACE_JPEG, 352 .colorspace = V4L2_COLORSPACE_JPEG,
353 .priv = 0 | MODE_JPEG}, 353 .priv = 0 | MODE_JPEG},
354 {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, 354 {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
@@ -363,7 +363,7 @@ static const struct v4l2_pix_format vga_mode[] = {
363 .priv = 0}, 363 .priv = 0},
364 {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, 364 {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
365 .bytesperline = 320, 365 .bytesperline = 320,
366 .sizeimage = 480 * 240 , 366 .sizeimage = 320 * 240 * 3 / 8 + 590,
367 .colorspace = V4L2_COLORSPACE_JPEG, 367 .colorspace = V4L2_COLORSPACE_JPEG,
368 .priv = 1 | MODE_JPEG}, 368 .priv = 1 | MODE_JPEG},
369 {320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, 369 {320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
@@ -378,7 +378,7 @@ static const struct v4l2_pix_format vga_mode[] = {
378 .priv = 1}, 378 .priv = 1},
379 {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, 379 {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
380 .bytesperline = 640, 380 .bytesperline = 640,
381 .sizeimage = 960 * 480, 381 .sizeimage = 640 * 480 * 3 / 8 + 590,
382 .colorspace = V4L2_COLORSPACE_JPEG, 382 .colorspace = V4L2_COLORSPACE_JPEG,
383 .priv = 2 | MODE_JPEG}, 383 .priv = 2 | MODE_JPEG},
384 {640, 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, 384 {640, 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
@@ -396,7 +396,7 @@ static const struct v4l2_pix_format vga_mode[] = {
396static const struct v4l2_pix_format sxga_mode[] = { 396static const struct v4l2_pix_format sxga_mode[] = {
397 {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, 397 {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
398 .bytesperline = 160, 398 .bytesperline = 160,
399 .sizeimage = 240 * 120, 399 .sizeimage = 160 * 120 * 4 / 8 + 590,
400 .colorspace = V4L2_COLORSPACE_JPEG, 400 .colorspace = V4L2_COLORSPACE_JPEG,
401 .priv = 0 | MODE_JPEG}, 401 .priv = 0 | MODE_JPEG},
402 {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, 402 {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
@@ -411,7 +411,7 @@ static const struct v4l2_pix_format sxga_mode[] = {
411 .priv = 0}, 411 .priv = 0},
412 {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, 412 {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
413 .bytesperline = 320, 413 .bytesperline = 320,
414 .sizeimage = 480 * 240 , 414 .sizeimage = 320 * 240 * 3 / 8 + 590,
415 .colorspace = V4L2_COLORSPACE_JPEG, 415 .colorspace = V4L2_COLORSPACE_JPEG,
416 .priv = 1 | MODE_JPEG}, 416 .priv = 1 | MODE_JPEG},
417 {320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, 417 {320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
@@ -426,7 +426,7 @@ static const struct v4l2_pix_format sxga_mode[] = {
426 .priv = 1}, 426 .priv = 1},
427 {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, 427 {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
428 .bytesperline = 640, 428 .bytesperline = 640,
429 .sizeimage = 960 * 480, 429 .sizeimage = 640 * 480 * 3 / 8 + 590,
430 .colorspace = V4L2_COLORSPACE_JPEG, 430 .colorspace = V4L2_COLORSPACE_JPEG,
431 .priv = 2 | MODE_JPEG}, 431 .priv = 2 | MODE_JPEG},
432 {640, 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, 432 {640, 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
@@ -441,7 +441,7 @@ static const struct v4l2_pix_format sxga_mode[] = {
441 .priv = 2}, 441 .priv = 2},
442 {1280, 1024, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, 442 {1280, 1024, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
443 .bytesperline = 1280, 443 .bytesperline = 1280,
444 .sizeimage = (1280 * 1024) + 64, 444 .sizeimage = 1280 * 1024,
445 .colorspace = V4L2_COLORSPACE_SRGB, 445 .colorspace = V4L2_COLORSPACE_SRGB,
446 .priv = 3 | MODE_RAW | MODE_SXGA}, 446 .priv = 3 | MODE_RAW | MODE_SXGA},
447}; 447};