diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-09-05 09:38:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-01 16:12:51 -0400 |
commit | 30634e8e41d413b0084ba29f843361a1fd9fbdce (patch) | |
tree | 0712b67462e242c926502ff697beed75b6f078d6 /drivers/media/i2c/saa7115.c | |
parent | 34a6b7d093d8fe738ada191b36648d00bc18b7eb (diff) |
[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>
Diffstat (limited to 'drivers/media/i2c/saa7115.c')
-rw-r--r-- | drivers/media/i2c/saa7115.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c index 2107336cd836..6b6788cd08f6 100644 --- a/drivers/media/i2c/saa7115.c +++ b/drivers/media/i2c/saa7115.c | |||
@@ -1066,7 +1066,8 @@ static int saa711x_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f | |||
1066 | }; | 1066 | }; |
1067 | int i; | 1067 | int i; |
1068 | 1068 | ||
1069 | memset(sliced, 0, sizeof(*sliced)); | 1069 | memset(sliced->service_lines, 0, sizeof(sliced->service_lines)); |
1070 | sliced->service_set = 0; | ||
1070 | /* done if using raw VBI */ | 1071 | /* done if using raw VBI */ |
1071 | if (saa711x_read(sd, R_80_GLOBAL_CNTL_1) & 0x10) | 1072 | if (saa711x_read(sd, R_80_GLOBAL_CNTL_1) & 0x10) |
1072 | return 0; | 1073 | return 0; |