mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
[media] sliced vbi: subdevs shouldn't clear the full v4l2_sliced_vbi_format struct
Various subdevs cleared the full v4l2_sliced_vbi_format struct, when only the service_set/lines fields should have been cleared. Due to this the io_size field was wrongly cleared to 0, causing a v4l2-compliance error. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
34a6b7d093
commit
30634e8e41
7 changed files with 10 additions and 9 deletions
|
@ -96,7 +96,8 @@ int cx25840_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *
|
|||
int is_pal = !(state->std & V4L2_STD_525_60);
|
||||
int i;
|
||||
|
||||
memset(svbi, 0, sizeof(*svbi));
|
||||
memset(svbi->service_lines, 0, sizeof(svbi->service_lines));
|
||||
svbi->service_set = 0;
|
||||
/* we're done if raw VBI is active */
|
||||
if ((cx25840_read(client, 0x404) & 0x10) == 0)
|
||||
return 0;
|
||||
|
|
|
@ -1066,7 +1066,8 @@ static int saa711x_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
|
|||
};
|
||||
int i;
|
||||
|
||||
memset(sliced, 0, sizeof(*sliced));
|
||||
memset(sliced->service_lines, 0, sizeof(sliced->service_lines));
|
||||
sliced->service_set = 0;
|
||||
/* done if using raw VBI */
|
||||
if (saa711x_read(sd, R_80_GLOBAL_CNTL_1) & 0x10)
|
||||
return 0;
|
||||
|
|
|
@ -625,7 +625,7 @@ static int saa7127_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
|
|||
{
|
||||
struct saa7127_state *state = to_state(sd);
|
||||
|
||||
memset(fmt, 0, sizeof(*fmt));
|
||||
memset(fmt->service_lines, 0, sizeof(fmt->service_lines));
|
||||
if (state->vps_enable)
|
||||
fmt->service_lines[0][16] = V4L2_SLICED_VPS;
|
||||
if (state->wss_enable)
|
||||
|
|
|
@ -1020,7 +1020,7 @@ static int tvp5150_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
|
|||
{
|
||||
int i, mask = 0;
|
||||
|
||||
memset(svbi, 0, sizeof(*svbi));
|
||||
memset(svbi->service_lines, 0, sizeof(svbi->service_lines));
|
||||
|
||||
for (i = 0; i <= 23; i++) {
|
||||
svbi->service_lines[0][i] =
|
||||
|
|
|
@ -143,7 +143,9 @@ int cx18_av_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *
|
|||
int is_pal = !(state->std & V4L2_STD_525_60);
|
||||
int i;
|
||||
|
||||
memset(svbi, 0, sizeof(*svbi));
|
||||
memset(svbi->service_lines, 0, sizeof(svbi->service_lines));
|
||||
svbi->service_set = 0;
|
||||
|
||||
/* we're done if raw VBI is active */
|
||||
if ((cx18_av_read(cx, 0x404) & 0x10) == 0)
|
||||
return 0;
|
||||
|
|
|
@ -210,10 +210,6 @@ static int cx18_g_fmt_sliced_vbi_cap(struct file *file, void *fh,
|
|||
if (v4l2_subdev_call(cx->sd_av, vbi, g_sliced_fmt, &fmt->fmt.sliced))
|
||||
return -EINVAL;
|
||||
|
||||
/* Ensure V4L2 spec compliant output */
|
||||
vbifmt->reserved[0] = 0;
|
||||
vbifmt->reserved[1] = 0;
|
||||
vbifmt->io_size = sizeof(struct v4l2_sliced_vbi_data) * 36;
|
||||
vbifmt->service_set = cx18_get_service_set(vbifmt);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -326,6 +326,7 @@ static int ivtv_g_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_fo
|
|||
if (!(itv->v4l2_cap & V4L2_CAP_SLICED_VBI_OUTPUT))
|
||||
return -EINVAL;
|
||||
vbifmt->io_size = sizeof(struct v4l2_sliced_vbi_data) * 36;
|
||||
memset(vbifmt->service_lines, 0, sizeof(vbifmt->service_lines));
|
||||
if (itv->is_60hz) {
|
||||
vbifmt->service_lines[0][21] = V4L2_SLICED_CAPTION_525;
|
||||
vbifmt->service_lines[1][21] = V4L2_SLICED_CAPTION_525;
|
||||
|
|
Loading…
Reference in a new issue