1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index a277f95091ef..1fb7d5bd5ec2 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -1042,7 +1042,8 @@ static int vidioc_querycap(struct file *file, void *fh,
         strlcpy(cap->driver, VOUT_NAME, sizeof(cap->driver));
         strlcpy(cap->card, vout->vfd->name, sizeof(cap->card));
         cap->bus_info[0] = '\0';
-        cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT;
+        cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |
+                V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
 
         return 0;
 }
@@ -1825,7 +1826,9 @@ static int vidioc_g_fbuf(struct file *file, void *fh,
         ovid = &vout->vid_info;
         ovl = ovid->overlays[0];
 
-        a->flags = 0x0;
+        /* The video overlay must stay within the framebuffer and can't be
+           positioned independently. */
+        a->flags = V4L2_FBUF_FLAG_OVERLAY;
         a->capability = V4L2_FBUF_CAP_LOCAL_ALPHA | V4L2_FBUF_CAP_CHROMAKEY
                 | V4L2_FBUF_CAP_SRC_CHROMAKEY;