[media] Set vfl_dir for all display or m2m drivers

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 7 insertions, 0 deletions

diff --git a/drivers/media/pci/ivtv/ivtv-streams.c b/drivers/media/pci/ivtv/ivtv-streams.c
index 0ff264e0e0f6..7b8648a827f5 100644
--- a/drivers/media/pci/ivtv/ivtv-streams.c
+++ b/drivers/media/pci/ivtv/ivtv-streams.c
@@ -222,6 +222,9 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
 
         s->vdev->num = num;
         s->vdev->v4l2_dev = &itv->v4l2_dev;
+        if (ivtv_stream_info[type].v4l2_caps &
+                        (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_SLICED_VBI_OUTPUT))
+                s->vdev->vfl_dir = VFL_DIR_TX;
         s->vdev->fops = ivtv_stream_info[type].fops;
         s->vdev->ctrl_handler = itv->v4l2_dev.ctrl_handler;
         s->vdev->release = video_device_release;
diff --git a/drivers/media/pci/zoran/zoran_card.c b/drivers/media/pci/zoran/zoran_card.c
index c3602d6cd48e..fffc54b452c8 100644
--- a/drivers/media/pci/zoran/zoran_card.c
+++ b/drivers/media/pci/zoran/zoran_card.c
@@ -1055,6 +1055,10 @@ zr36057_init (struct zoran *zr)
         memcpy(zr->video_dev, &zoran_template, sizeof(zoran_template));
         zr->video_dev->parent = &zr->pci_dev->dev;
         strcpy(zr->video_dev->name, ZR_DEVNAME(zr));
+        /* It's not a mem2mem device, but you can both capture and output from
+           one and the same device. This should really be split up into two
+           device nodes, but that's a job for another day. */
+        zr->video_dev->vfl_dir = VFL_DIR_M2M;
         err = video_register_device(zr->video_dev, VFL_TYPE_GRABBER, video_nr[zr->id]);
         if (err < 0)
                 goto exit_free;