diff options
author | Sylwester Nawrocki <sylvester.nawrocki@gmail.com> | 2012-09-15 14:57:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-26 16:24:31 -0400 |
commit | 4703d356e7890764c05328cc543d6507f132dfe6 (patch) | |
tree | 42eeb7acb24ae28d4d0797555d237b59ac2971b3 /drivers/media/platform/m2m-deinterlace.c | |
parent | 9e18404adac2e8396335eb8e4cb380f619186042 (diff) |
[media] m2m-deinterlace: Add V4L2_CAP_VIDEO_M2M capability flag
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>
Diffstat (limited to 'drivers/media/platform/m2m-deinterlace.c')
-rw-r--r-- | drivers/media/platform/m2m-deinterlace.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c index c4ad9fca5dbf..45164c4f8452 100644 --- a/drivers/media/platform/m2m-deinterlace.c +++ b/drivers/media/platform/m2m-deinterlace.c | |||
@@ -456,8 +456,13 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
456 | strlcpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver)); | 456 | strlcpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver)); |
457 | strlcpy(cap->card, MEM2MEM_NAME, sizeof(cap->card)); | 457 | strlcpy(cap->card, MEM2MEM_NAME, sizeof(cap->card)); |
458 | strlcpy(cap->bus_info, MEM2MEM_NAME, sizeof(cap->card)); | 458 | strlcpy(cap->bus_info, MEM2MEM_NAME, sizeof(cap->card)); |
459 | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT | 459 | /* |
460 | | V4L2_CAP_STREAMING; | 460 | * This is only a mem-to-mem video device. The capture and output |
461 | * device capability flags are left only for backward compatibility | ||
462 | * and are scheduled for removal. | ||
463 | */ | ||
464 | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT | | ||
465 | V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING; | ||
461 | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; | 466 | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; |
462 | 467 | ||
463 | return 0; | 468 | return 0; |