[media] m2m-deinterlace: Add V4L2_CAP_VIDEO_M2M capability flag
authorSylwester Nawrocki <sylvester.nawrocki@gmail.com>
Sat, 15 Sep 2012 18:57:41 +0000 (15:57 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 26 Sep 2012 20:24:31 +0000 (17:24 -0300)
New mem-to-mem video drivers should use V4L2_CAP_VIDEO_M2M capability, rather
than ORed V4L2_CAP_VIDEO_CAPTURE and V4L2_CAP_VIDEO_OUTPUT flags, as outlined
in commit a1367f1b260d29e9b9fb20d8e2f39f1e74fa6c3b.

Acked-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/m2m-deinterlace.c

index c4ad9fca5dbf31704e239b25a65d3c0a1bdc2689..45164c4f8452975d2bbd12978b3c6d9ff8229118 100644 (file)
@@ -456,8 +456,13 @@ static int vidioc_querycap(struct file *file, void *priv,
        strlcpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver));
        strlcpy(cap->card, MEM2MEM_NAME, sizeof(cap->card));
        strlcpy(cap->bus_info, MEM2MEM_NAME, sizeof(cap->card));
-       cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT
-                         | V4L2_CAP_STREAMING;
+       /*
+        * This is only a mem-to-mem video device. The capture and output
+        * device capability flags are left only for backward compatibility
+        * and are scheduled for removal.
+        */
+       cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
+                          V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
 
        return 0;