V4L/DVB (6116): ivtv: VBI cleanups and fixes

Besides some VBI cleanups this patch also fixes a subtle problem with the
VBI re-insertion stream where the PIO work handler wasn't called quickly
enough, resulting in occasional corrupt data.

Furthermore the CC output didn't disable CC correctly and at the right time,
causing duplicates to be sent.

An saa7127 fix for VPS output was also added: the wrong data was sent.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 9f986930490f..e35ef321ec71 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -332,11 +332,11 @@ static int saa7127_set_vps(struct i2c_client *client, struct v4l2_sliced_vbi_dat
         if (!enable)
                 return 0;
 
-        state->vps_data[0] = data->data[4];
-        state->vps_data[1] = data->data[10];
-        state->vps_data[2] = data->data[11];
-        state->vps_data[3] = data->data[12];
-        state->vps_data[4] = data->data[13];
+        state->vps_data[0] = data->data[2];
+        state->vps_data[1] = data->data[8];
+        state->vps_data[2] = data->data[9];
+        state->vps_data[3] = data->data[10];
+        state->vps_data[4] = data->data[11];
         v4l_dbg(1, debug, client, "Set VPS data %02x %02x %02x %02x %02x\n",
                 state->vps_data[0], state->vps_data[1],
                 state->vps_data[2], state->vps_data[3],