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 cabd5a2c3718..fcabc023885d 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 7f20ca53b6f2..b716fbd4241f 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;