From 15c8905f548f08189a3ef99132b540ea67056087 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Sat, 15 Sep 2012 15:57:41 -0300 Subject: [PATCH] --- yaml --- r: 331135 b: refs/heads/master c: 4703d356e7890764c05328cc543d6507f132dfe6 h: refs/heads/master i: 331133: a8abfddd15f04a563cb76dc13ef0bb8ea3de2d80 331131: 9aea11148a09a587530abdf91d77a9f1f6b3dd64 331127: 1a34d94a7a1e3817895dd3dfa435d3af812179b7 331119: 59927e60c2dcd837e21c432709e87b277d831764 331103: 87b0a10fa7b0cc9cb70fe968a511efcf801e2b15 331071: aad044f10f7a3d188433afe47c4ac3549736c6f7 331007: 52eba6702d4f03fb1351011f52e8b12df096eb16 v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/m2m-deinterlace.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a5aa786cdc75..700bb6141146 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e18404adac2e8396335eb8e4cb380f619186042 +refs/heads/master: 4703d356e7890764c05328cc543d6507f132dfe6 diff --git a/trunk/drivers/media/platform/m2m-deinterlace.c b/trunk/drivers/media/platform/m2m-deinterlace.c index c4ad9fca5dbf..45164c4f8452 100644 --- a/trunk/drivers/media/platform/m2m-deinterlace.c +++ b/trunk/drivers/media/platform/m2m-deinterlace.c @@ -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;