Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1e4665b authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0b656321

drivers/media/video/gspca/sn9c20x.c

+12 −12
Original line number Diff line number Diff line
@@ -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},