From 1918c9df72ed38245a3e6136cf9730b0b9f9dfda Mon Sep 17 00:00:00 2001 From: "Lad, Prabhakar" Date: Tue, 25 Sep 2012 11:21:55 -0300 Subject: [PATCH] --- yaml --- r: 333786 b: refs/heads/master c: 626d533f8cb63b6c0cd6b83e1ce7e7656ccaba84 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/davinci/vpif_capture.c | 8 +++++--- trunk/drivers/media/platform/davinci/vpif_display.c | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5157c75a51b7..eac3dfb4e13d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4a711e7bf59e556d5f692e0c65ef12c6dad6cf8 +refs/heads/master: 626d533f8cb63b6c0cd6b83e1ce7e7656ccaba84 diff --git a/trunk/drivers/media/platform/davinci/vpif_capture.c b/trunk/drivers/media/platform/davinci/vpif_capture.c index cabd5a2c3718..fcabc023885d 100644 --- a/trunk/drivers/media/platform/davinci/vpif_capture.c +++ b/trunk/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/trunk/drivers/media/platform/davinci/vpif_display.c b/trunk/drivers/media/platform/davinci/vpif_display.c index 7f20ca53b6f2..b716fbd4241f 100644 --- a/trunk/drivers/media/platform/davinci/vpif_display.c +++ b/trunk/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;