All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [media] rcar_vin: Update device_caps and capabilities in querycap
@ 2015-01-14  0:55 Nobuhiro Iwamatsu
  0 siblings, 0 replies; only message in thread
From: Nobuhiro Iwamatsu @ 2015-01-14  0:55 UTC (permalink / raw)
  To: linux-media; +Cc: g.liakhovetski, Nobuhiro Iwamatsu

device_caps in v4l2_capability structure must have been set value like
capabilities. This set the value to device_caps, and set V4L2_CAP_DEVICE_CAPS
to capabilities.
This fixes check by commit 454a4e728dd5 ("[media] v4l2-ioctl: WARN_ON if
querycap didn't fill device_caps").

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
 drivers/media/platform/soc_camera/rcar_vin.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 0c1f556..9f1473c 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -1799,7 +1799,9 @@ static int rcar_vin_querycap(struct soc_camera_host *ici,
 			     struct v4l2_capability *cap)
 {
 	strlcpy(cap->card, "R_Car_VIN", sizeof(cap->card));
-	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+
 	return 0;
 }
 
-- 
2.1.3


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-01-14  0:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-14  0:55 [PATCH] [media] rcar_vin: Update device_caps and capabilities in querycap Nobuhiro Iwamatsu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.