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, 7 insertions, 4 deletions

diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 5b5d6666fa16..da50fa4a72a5 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -563,8 +563,11 @@ ssize_t ivtv_v4l2_write(struct file *filp, const char __user *user_buf, size_t c
 
         /* This stream does not need to start any decoding */
         if (s->type == IVTV_DEC_STREAM_TYPE_VOUT) {
+                int elems = count / sizeof(struct v4l2_sliced_vbi_data);
+
                 set_bit(IVTV_F_S_APPL_IO, &s->s_flags);
-                return ivtv_write_vbi(itv, user_buf, count);
+                ivtv_write_vbi(itv, (const struct v4l2_sliced_vbi_data *)user_buf, elems);
+                return elems * sizeof(struct v4l2_sliced_vbi_data);
         }
 
         mode = s->type == IVTV_DEC_STREAM_TYPE_MPG ? OUT_MPG : OUT_YUV;
@@ -828,10 +831,10 @@ int ivtv_v4l2_close(struct inode *inode, struct file *filp)
                 ivtv_stop_decoding(id, VIDEO_CMD_STOP_TO_BLACK | VIDEO_CMD_STOP_IMMEDIATELY, 0);
 
                 /* If all output streams are closed, and if the user doesn't have
-                   IVTV_DEC_STREAM_TYPE_VOUT open, then disable VBI on TV-out. */
+                   IVTV_DEC_STREAM_TYPE_VOUT open, then disable CC on TV-out. */
                 if (itv->output_mode == OUT_NONE && !test_bit(IVTV_F_S_APPL_IO, &s_vout->s_flags)) {
-                        /* disable VBI on TV-out */
-                        ivtv_disable_vbi(itv);
+                        /* disable CC on TV-out */
+                        ivtv_disable_cc(itv);
                 }
         } else {
                 ivtv_stop_capture(id, 0);