diff options
author | Sylwester Nawrocki <sylvester.nawrocki@gmail.com> | 2012-08-22 17:00:19 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-26 15:21:55 -0400 |
commit | c3aac8be4f2b51bb44fdb1713e25690866cace21 (patch) | |
tree | 514a759186a7be04e4ee6ed7df5324bd4199435e /drivers/media/platform/coda.c | |
parent | 8c82c75c3950dea31fe03567125feea089893141 (diff) |
[media] coda: 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.
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Acked-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/coda.c')
-rw-r--r-- | drivers/media/platform/coda.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index 10eaf1189d89..3383e16701fc 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c | |||
@@ -287,8 +287,13 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
287 | strlcpy(cap->driver, CODA_NAME, sizeof(cap->driver)); | 287 | strlcpy(cap->driver, CODA_NAME, sizeof(cap->driver)); |
288 | strlcpy(cap->card, CODA_NAME, sizeof(cap->card)); | 288 | strlcpy(cap->card, CODA_NAME, sizeof(cap->card)); |
289 | strlcpy(cap->bus_info, CODA_NAME, sizeof(cap->bus_info)); | 289 | strlcpy(cap->bus_info, CODA_NAME, sizeof(cap->bus_info)); |
290 | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT | 290 | /* |
291 | | V4L2_CAP_STREAMING; | 291 | * This is only a mem-to-mem video device. The capture and output |
292 | * device capability flags are left only for backward compatibility | ||
293 | * and are scheduled for removal. | ||
294 | */ | ||
295 | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT | | ||
296 | V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING; | ||
292 | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; | 297 | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; |
293 | 298 | ||
294 | return 0; | 299 | return 0; |