On Thu 4 October 2012 11:29:58 Prabhakar wrote:
> From: Lad, Prabhakar <prabhakar.lad@xxxxxx>
>
> set device_caps and also change the driver and
> bus_info to proper values as per standard.
>
> Signed-off-by: Lad, Prabhakar <prabhakar.lad@xxxxxx>
> Signed-off-by: Manjunath Hadli <manjunath.hadli@xxxxxx>
> Cc: Hans Verkuil <hans.verkuil@xxxxxxxxx>
Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
Regards,
Hans
> ---
> Changes for v3:
> 1: Removed READWRITE flag for device_caps pointed by Hans.
>
> Changes for v2:
> 1: Change the bus_info and driver to proper values,
> pointed by Hans.
>
> drivers/media/platform/davinci/vpif_capture.c | 8 +++++---
> drivers/media/platform/davinci/vpif_display.c | 8 +++++---
> 2 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
> index cabd5a2..fcabc02 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -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;
> diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
> index 7f20ca5..b716fbd 100644
> --- a/drivers/media/platform/davinci/vpif_display.c
> +++ b/drivers/media/platform/davinci/vpif_display.c
> @@ -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;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
