2 files changed, 30 insertions, 12 deletions

diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 683beb4f1951..6fe6c4a0e858 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -448,9 +448,12 @@ static int ivtv_g_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f
 static int ivtv_g_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_format *fmt)
 {
         struct ivtv *itv = fh2id(fh)->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         struct v4l2_window *winfmt = &fmt->fmt.win;
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -EINVAL;
+        if (!itv->osd_video_pbase)
                 return -EINVAL;
         winfmt->chromakey = itv->osd_chroma_key;
         winfmt->global_alpha = itv->osd_global_alpha;
@@ -555,10 +558,13 @@ static int ivtv_try_fmt_vid_out(struct file *file, void *fh, struct v4l2_format
 static int ivtv_try_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_format *fmt)
 {
         struct ivtv *itv = fh2id(fh)->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         u32 chromakey = fmt->fmt.win.chromakey;
         u8 global_alpha = fmt->fmt.win.global_alpha;
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -EINVAL;
+        if (!itv->osd_video_pbase)
                 return -EINVAL;
         ivtv_g_fmt_vid_out_overlay(file, fh, fmt);
         fmt->fmt.win.chromakey = chromakey;
@@ -741,6 +747,11 @@ static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vc
         snprintf(vcap->bus_info, sizeof(vcap->bus_info), "PCI:%s", pci_name(itv->pdev));
         vcap->capabilities = itv->v4l2_cap | V4L2_CAP_DEVICE_CAPS;
         vcap->device_caps = s->caps;
+        if ((s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY) &&
+            !itv->osd_video_pbase) {
+                vcap->capabilities &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+                vcap->device_caps &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+        }
         return 0;
 }
 
@@ -1363,6 +1374,7 @@ static int ivtv_try_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder
 static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
 {
         struct ivtv *itv = fh2id(fh)->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         u32 data[CX2341X_MBOX_MAX_DATA];
         struct yuv_playback_info *yi = &itv->yuv_info;
 
@@ -1386,10 +1398,10 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
                 0,
         };
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
-                return -EINVAL;
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -ENOTTY;
         if (!itv->osd_video_pbase)
-                return -EINVAL;
+                return -ENOTTY;
 
         fb->capability = V4L2_FBUF_CAP_EXTERNOVERLAY | V4L2_FBUF_CAP_CHROMAKEY |
                 V4L2_FBUF_CAP_GLOBAL_ALPHA;
@@ -1450,12 +1462,13 @@ static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffe
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
         struct yuv_playback_info *yi = &itv->yuv_info;
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
-                return -EINVAL;
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -ENOTTY;
         if (!itv->osd_video_pbase)
-                return -EINVAL;
+                return -ENOTTY;
 
         itv->osd_global_alpha_state = (fb->flags & V4L2_FBUF_FLAG_GLOBAL_ALPHA) != 0;
         itv->osd_local_alpha_state =
@@ -1470,9 +1483,12 @@ static int ivtv_overlay(struct file *file, void *fh, unsigned int on)
 {
         struct ivtv_open_id *id = fh2id(fh);
         struct ivtv *itv = id->itv;
+        struct ivtv_stream *s = &itv->streams[fh2id(fh)->type];
 
-        if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
-                return -EINVAL;
+        if (!(s->caps & V4L2_CAP_VIDEO_OUTPUT_OVERLAY))
+                return -ENOTTY;
+        if (!itv->osd_video_pbase)
+                return -ENOTTY;
 
         ivtv_vapi(itv, CX2341X_OSD_SET_STATE, 1, on != 0);
 
diff --git a/drivers/media/pci/ivtv/ivtv-streams.c b/drivers/media/pci/ivtv/ivtv-streams.c
index cfb61f23d8ed..d27c6df97566 100644
--- a/drivers/media/pci/ivtv/ivtv-streams.c
+++ b/drivers/media/pci/ivtv/ivtv-streams.c
@@ -130,7 +130,8 @@ static struct {
                 "decoder MPG",
                 VFL_TYPE_GRABBER, IVTV_V4L2_DEC_MPG_OFFSET,
                 PCI_DMA_TODEVICE, 0,
-                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
+                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |
+                V4L2_CAP_VIDEO_OUTPUT_OVERLAY,
                 &ivtv_v4l2_dec_fops
         },
         {       /* IVTV_DEC_STREAM_TYPE_VBI */
@@ -151,7 +152,8 @@ static struct {
                 "decoder YUV",
                 VFL_TYPE_GRABBER, IVTV_V4L2_DEC_YUV_OFFSET,
                 PCI_DMA_TODEVICE, 0,
-                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
+                V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |
+                V4L2_CAP_VIDEO_OUTPUT_OVERLAY,
                 &ivtv_v4l2_dec_fops
         }
 };