From 9ed48879cc39e80a4863d93c3adef9b7329f2ee5 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Wed, 22 Aug 2012 18:00:19 -0300 Subject: [PATCH] --- yaml --- r: 331118 b: refs/heads/master c: c3aac8be4f2b51bb44fdb1713e25690866cace21 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/coda.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index da985bdacc7f..a871e2cc72dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c82c75c3950dea31fe03567125feea089893141 +refs/heads/master: c3aac8be4f2b51bb44fdb1713e25690866cace21 diff --git a/trunk/drivers/media/platform/coda.c b/trunk/drivers/media/platform/coda.c index 10eaf1189d89..3383e16701fc 100644 --- a/trunk/drivers/media/platform/coda.c +++ b/trunk/drivers/media/platform/coda.c @@ -287,8 +287,13 @@ static int vidioc_querycap(struct file *file, void *priv, strlcpy(cap->driver, CODA_NAME, sizeof(cap->driver)); strlcpy(cap->card, CODA_NAME, sizeof(cap->card)); strlcpy(cap->bus_info, CODA_NAME, sizeof(cap->bus_info)); - 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;