[PATCH for v3.6] Fix mem2mem_testdev querycap regression

2012-08-01 Thread Hans Verkuil 
Trival but important patch.

Signed-off-by: Hans Verkuil hans.verk...@cisco.com

diff --git a/drivers/media/video/mem2mem_testdev.c 
b/drivers/media/video/mem2mem_testdev.c
index 7efe9ad..0b91a5c 100644
--- a/drivers/media/video/mem2mem_testdev.c
+++ b/drivers/media/video/mem2mem_testdev.c
@@ -431,7 +431,7 @@ static int vidioc_querycap(struct file *file, void *priv,
strncpy(cap-driver, MEM2MEM_NAME, sizeof(cap-driver) - 1);
strncpy(cap-card, MEM2MEM_NAME, sizeof(cap-card) - 1);
strlcpy(cap-bus_info, MEM2MEM_NAME, sizeof(cap-bus_info));
-   cap-capabilities = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
+   cap-device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
cap-capabilities = cap-device_caps | V4L2_CAP_DEVICE_CAPS;
return 0;
 }
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH for v3.6] Fix mem2mem_testdev querycap regression

2012-08-01 Thread Sylwester Nawrocki 
On 08/01/2012 09:32 AM, Hans Verkuil wrote:
 Trival but important patch.
 
 Signed-off-by: Hans Verkuil hans.verk...@cisco.com
 
 diff --git a/drivers/media/video/mem2mem_testdev.c 
 b/drivers/media/video/mem2mem_testdev.c
 index 7efe9ad..0b91a5c 100644
 --- a/drivers/media/video/mem2mem_testdev.c
 +++ b/drivers/media/video/mem2mem_testdev.c
 @@ -431,7 +431,7 @@ static int vidioc_querycap(struct file *file, void *priv,
   strncpy(cap-driver, MEM2MEM_NAME, sizeof(cap-driver) - 1);
   strncpy(cap-card, MEM2MEM_NAME, sizeof(cap-card) - 1);
   strlcpy(cap-bus_info, MEM2MEM_NAME, sizeof(cap-bus_info));
 - cap-capabilities = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
 + cap-device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
   cap-capabilities = cap-device_caps | V4L2_CAP_DEVICE_CAPS;
   return 0;
  }

Oops, my bad. Thanks for fixing this Hans!

Regards,
Sylwester
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html