V4L/DVB (6061): ivtv: add VIDIOC_OVERLAY

Add VIDIOC_OVERLAY to enable/disable the OSD. Also add the OSD state to the
log status report.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 65fa247e33c5..ebf925c549fd 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -75,7 +75,7 @@ static struct {
         struct file_operations *fops;
 } ivtv_stream_info[] = {
         {       /* IVTV_ENC_STREAM_TYPE_MPG */
-                "encoder MPEG",
+                "encoder MPG",
                 VFL_TYPE_GRABBER, 0,
                 PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_VIDEO_CAPTURE,
                 &ivtv_v4l2_enc_fops
@@ -93,7 +93,7 @@ static struct {
                 &ivtv_v4l2_enc_fops
         },
         {       /* IVTV_ENC_STREAM_TYPE_PCM */
-                "encoder PCM audio",
+                "encoder PCM",
                 VFL_TYPE_GRABBER, IVTV_V4L2_ENC_PCM_OFFSET,
                 PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_PRIVATE,
                 &ivtv_v4l2_enc_fops
@@ -105,7 +105,7 @@ static struct {
                 &ivtv_v4l2_enc_fops
         },
         {       /* IVTV_DEC_STREAM_TYPE_MPG */
-                "decoder MPEG",
+                "decoder MPG",
                 VFL_TYPE_GRABBER, IVTV_V4L2_DEC_MPG_OFFSET,
                 PCI_DMA_TODEVICE, 0, V4L2_BUF_TYPE_VIDEO_OUTPUT,
                 &ivtv_v4l2_dec_fops