V4L/DVB: gspca - sn9c20x: Fix the number of bytes per line

Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
author: Jean-François Moine <moinejf@free.fr> 2010-09-13 04:25:41 -0400
committer: Mauro Carvalho Chehab <mchehab@redhat.com> 2010-10-20 23:05:54 -0400
commit: b1e4665b667bcec77d62742fa9238aeac3cb4232 (patch)
tree: d841570609ae89c28d9a0a2d12f18f38577e6206 /drivers/media/video/gspca
parent: 0b656321f338a2e5e3d9a9bdce959a2d76857967 (diff)
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index b1c4d74e1c22..4f8ad37ffa25 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -347,7 +347,7 @@ static const struct ctrl sd_ctrls[] = {
 static const struct v4l2_pix_format vga_mode[] = {
        {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
-                .bytesperline = 240,
+                .bytesperline = 160,
                .sizeimage = 240 * 120,
                .colorspace = V4L2_COLORSPACE_JPEG,
                .priv = 0 | MODE_JPEG},
@@ -357,12 +357,12 @@ static const struct v4l2_pix_format vga_mode[] = {
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 0 | MODE_RAW},
        {160, 120, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
-                .bytesperline = 240,
+                .bytesperline = 160,
                .sizeimage = 240 * 120,
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 0},
        {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
-                .bytesperline = 480,
+                .bytesperline = 320,
                .sizeimage = 480 * 240 ,
                .colorspace = V4L2_COLORSPACE_JPEG,
                .priv = 1 | MODE_JPEG},
@@ -372,12 +372,12 @@ static const struct v4l2_pix_format vga_mode[] = {
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 1 | MODE_RAW},
        {320, 240, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
-                .bytesperline = 480,
+                .bytesperline = 320,
                .sizeimage = 480 * 240 ,
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 1},
        {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
-                .bytesperline = 960,
+                .bytesperline = 640,
                .sizeimage = 960 * 480,
                .colorspace = V4L2_COLORSPACE_JPEG,
                .priv = 2 | MODE_JPEG},
@@ -387,7 +387,7 @@ static const struct v4l2_pix_format vga_mode[] = {
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 2 | MODE_RAW},
        {640, 480, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
-                .bytesperline = 960,
+                .bytesperline = 640,
                .sizeimage = 960 * 480,
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 2},
@@ -395,7 +395,7 @@ static const struct v4l2_pix_format vga_mode[] = {
 static const struct v4l2_pix_format sxga_mode[] = {
        {160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
-                .bytesperline = 240,
+                .bytesperline = 160,
                .sizeimage = 240 * 120,
                .colorspace = V4L2_COLORSPACE_JPEG,
                .priv = 0 | MODE_JPEG},
@@ -405,12 +405,12 @@ static const struct v4l2_pix_format sxga_mode[] = {
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 0 | MODE_RAW},
        {160, 120, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
-                .bytesperline = 240,
+                .bytesperline = 160,
                .sizeimage = 240 * 120,
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 0},
        {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
-                .bytesperline = 480,
+                .bytesperline = 320,
                .sizeimage = 480 * 240 ,
                .colorspace = V4L2_COLORSPACE_JPEG,
                .priv = 1 | MODE_JPEG},
@@ -420,12 +420,12 @@ static const struct v4l2_pix_format sxga_mode[] = {
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 1 | MODE_RAW},
        {320, 240, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
-                .bytesperline = 480,
+                .bytesperline = 320,
                .sizeimage = 480 * 240 ,
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 1},
        {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
-                .bytesperline = 960,
+                .bytesperline = 640,
                .sizeimage = 960 * 480,
                .colorspace = V4L2_COLORSPACE_JPEG,
                .priv = 2 | MODE_JPEG},
@@ -435,7 +435,7 @@ static const struct v4l2_pix_format sxga_mode[] = {
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 2 | MODE_RAW},
        {640, 480, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
-                .bytesperline = 960,
+                .bytesperline = 640,
                .sizeimage = 960 * 480,
                .colorspace = V4L2_COLORSPACE_SRGB,
                .priv = 2},
author	Jean-François Moine <moinejf@free.fr>	2010-09-13 04:25:41 -0400
committer	Mauro Carvalho Chehab <mchehab@redhat.com>	2010-10-20 23:05:54 -0400
commit	b1e4665b667bcec77d62742fa9238aeac3cb4232 (patch)
tree	d841570609ae89c28d9a0a2d12f18f38577e6206 /drivers/media/video/gspca
parent	0b656321f338a2e5e3d9a9bdce959a2d76857967 (diff)

diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c index b1c4d74e1c22..4f8ad37ffa25 100644 --- a/drivers/media/video/gspca/sn9c20x.c +++ b/drivers/media/video/gspca/sn9c20x.c
@@ -347,7 +347,7 @@ static const struct ctrl sd_ctrls[] = {
347		347
348	static const struct v4l2_pix_format vga_mode[] = {	348	static 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 = 240,	350	.bytesperline = 160,
351	.sizeimage = 240 * 120,	351	.sizeimage = 240 * 120,
352	.colorspace = V4L2_COLORSPACE_JPEG,	352	.colorspace = V4L2_COLORSPACE_JPEG,
353	.priv = 0 \| MODE_JPEG},	353	.priv = 0 \| MODE_JPEG},
@@ -357,12 +357,12 @@ static const struct v4l2_pix_format vga_mode[] = {
357	.colorspace = V4L2_COLORSPACE_SRGB,	357	.colorspace = V4L2_COLORSPACE_SRGB,
358	.priv = 0 \| MODE_RAW},	358	.priv = 0 \| MODE_RAW},
359	{160, 120, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,	359	{160, 120, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
360	.bytesperline = 240,	360	.bytesperline = 160,
361	.sizeimage = 240 * 120,	361	.sizeimage = 240 * 120,
362	.colorspace = V4L2_COLORSPACE_SRGB,	362	.colorspace = V4L2_COLORSPACE_SRGB,
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 = 480,	365	.bytesperline = 320,
366	.sizeimage = 480 * 240 ,	366	.sizeimage = 480 * 240 ,
367	.colorspace = V4L2_COLORSPACE_JPEG,	367	.colorspace = V4L2_COLORSPACE_JPEG,
368	.priv = 1 \| MODE_JPEG},	368	.priv = 1 \| MODE_JPEG},
@@ -372,12 +372,12 @@ static const struct v4l2_pix_format vga_mode[] = {
372	.colorspace = V4L2_COLORSPACE_SRGB,	372	.colorspace = V4L2_COLORSPACE_SRGB,
373	.priv = 1 \| MODE_RAW},	373	.priv = 1 \| MODE_RAW},
374	{320, 240, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,	374	{320, 240, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
375	.bytesperline = 480,	375	.bytesperline = 320,
376	.sizeimage = 480 * 240 ,	376	.sizeimage = 480 * 240 ,
377	.colorspace = V4L2_COLORSPACE_SRGB,	377	.colorspace = V4L2_COLORSPACE_SRGB,
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 = 960,	380	.bytesperline = 640,
381	.sizeimage = 960 * 480,	381	.sizeimage = 960 * 480,
382	.colorspace = V4L2_COLORSPACE_JPEG,	382	.colorspace = V4L2_COLORSPACE_JPEG,
383	.priv = 2 \| MODE_JPEG},	383	.priv = 2 \| MODE_JPEG},
@@ -387,7 +387,7 @@ static const struct v4l2_pix_format vga_mode[] = {
387	.colorspace = V4L2_COLORSPACE_SRGB,	387	.colorspace = V4L2_COLORSPACE_SRGB,
388	.priv = 2 \| MODE_RAW},	388	.priv = 2 \| MODE_RAW},
389	{640, 480, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,	389	{640, 480, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
390	.bytesperline = 960,	390	.bytesperline = 640,
391	.sizeimage = 960 * 480,	391	.sizeimage = 960 * 480,
392	.colorspace = V4L2_COLORSPACE_SRGB,	392	.colorspace = V4L2_COLORSPACE_SRGB,
393	.priv = 2},	393	.priv = 2},
@@ -395,7 +395,7 @@ static const struct v4l2_pix_format vga_mode[] = {
395		395
396	static const struct v4l2_pix_format sxga_mode[] = {	396	static 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 = 240,	398	.bytesperline = 160,
399	.sizeimage = 240 * 120,	399	.sizeimage = 240 * 120,
400	.colorspace = V4L2_COLORSPACE_JPEG,	400	.colorspace = V4L2_COLORSPACE_JPEG,
401	.priv = 0 \| MODE_JPEG},	401	.priv = 0 \| MODE_JPEG},
@@ -405,12 +405,12 @@ static const struct v4l2_pix_format sxga_mode[] = {
405	.colorspace = V4L2_COLORSPACE_SRGB,	405	.colorspace = V4L2_COLORSPACE_SRGB,
406	.priv = 0 \| MODE_RAW},	406	.priv = 0 \| MODE_RAW},
407	{160, 120, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,	407	{160, 120, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
408	.bytesperline = 240,	408	.bytesperline = 160,
409	.sizeimage = 240 * 120,	409	.sizeimage = 240 * 120,
410	.colorspace = V4L2_COLORSPACE_SRGB,	410	.colorspace = V4L2_COLORSPACE_SRGB,
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 = 480,	413	.bytesperline = 320,
414	.sizeimage = 480 * 240 ,	414	.sizeimage = 480 * 240 ,
415	.colorspace = V4L2_COLORSPACE_JPEG,	415	.colorspace = V4L2_COLORSPACE_JPEG,
416	.priv = 1 \| MODE_JPEG},	416	.priv = 1 \| MODE_JPEG},
@@ -420,12 +420,12 @@ static const struct v4l2_pix_format sxga_mode[] = {
420	.colorspace = V4L2_COLORSPACE_SRGB,	420	.colorspace = V4L2_COLORSPACE_SRGB,
421	.priv = 1 \| MODE_RAW},	421	.priv = 1 \| MODE_RAW},
422	{320, 240, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,	422	{320, 240, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
423	.bytesperline = 480,	423	.bytesperline = 320,
424	.sizeimage = 480 * 240 ,	424	.sizeimage = 480 * 240 ,
425	.colorspace = V4L2_COLORSPACE_SRGB,	425	.colorspace = V4L2_COLORSPACE_SRGB,
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 = 960,	428	.bytesperline = 640,
429	.sizeimage = 960 * 480,	429	.sizeimage = 960 * 480,
430	.colorspace = V4L2_COLORSPACE_JPEG,	430	.colorspace = V4L2_COLORSPACE_JPEG,
431	.priv = 2 \| MODE_JPEG},	431	.priv = 2 \| MODE_JPEG},
@@ -435,7 +435,7 @@ static const struct v4l2_pix_format sxga_mode[] = {
435	.colorspace = V4L2_COLORSPACE_SRGB,	435	.colorspace = V4L2_COLORSPACE_SRGB,
436	.priv = 2 \| MODE_RAW},	436	.priv = 2 \| MODE_RAW},
437	{640, 480, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,	437	{640, 480, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
438	.bytesperline = 960,	438	.bytesperline = 640,
439	.sizeimage = 960 * 480,	439	.sizeimage = 960 * 480,
440	.colorspace = V4L2_COLORSPACE_SRGB,	440	.colorspace = V4L2_COLORSPACE_SRGB,
441	.priv = 2},	441	.priv = 2},