Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 626d533f authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[media] media: davinci: vpif: set device capabilities 



set device_caps and also change the driver and
bus_info to proper values as per standard.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: default avatarManjunath Hadli <manjunath.hadli@ti.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b4a711e7

drivers/media/platform/davinci/vpif_capture.c

+5 −3
Original line number Diff line number Diff line
@@ -1635,9 +1635,11 @@ static int vpif_querycap(struct file *file, void *priv, 
{

	struct vpif_capture_config *config = vpif_dev->platform_data;



	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	strlcpy(cap->driver, "vpif capture", sizeof(cap->driver));

	strlcpy(cap->bus_info, "VPIF Platform", sizeof(cap->bus_info));

	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;

	snprintf(cap->driver, sizeof(cap->driver), "%s", dev_name(vpif_dev));

	snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",

		 dev_name(vpif_dev));

	strlcpy(cap->card, config->card_name, sizeof(cap->card));



	return 0;

drivers/media/platform/davinci/vpif_display.c

+5 −3
Original line number Diff line number Diff line
@@ -827,9 +827,11 @@ static int vpif_querycap(struct file *file, void *priv, 
{

	struct vpif_display_config *config = vpif_dev->platform_data;



	cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;

	strlcpy(cap->driver, "vpif display", sizeof(cap->driver));

	strlcpy(cap->bus_info, "Platform", sizeof(cap->bus_info));

	cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;

	snprintf(cap->driver, sizeof(cap->driver), "%s", dev_name(vpif_dev));

	snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",

		 dev_name(vpif_dev));

	strlcpy(cap->card, config->card_name, sizeof(cap->card));



	return 0;