aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/davinci
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/platform/davinci')
-rw-r--r--drivers/media/platform/davinci/vpbe_display.c1
-rw-r--r--drivers/media/platform/davinci/vpfe_capture.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index 78b9ffebc94e..21a5a56eb5ea 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -639,7 +639,6 @@ static int vpbe_display_querycap(struct file *file, void *priv,
639 struct vpbe_layer *layer = video_drvdata(file); 639 struct vpbe_layer *layer = video_drvdata(file);
640 struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev; 640 struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
641 641
642 cap->version = VPBE_DISPLAY_VERSION_CODE;
643 cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; 642 cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
644 cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 643 cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
645 snprintf(cap->driver, sizeof(cap->driver), "%s", 644 snprintf(cap->driver, sizeof(cap->driver), "%s",
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index 3d0e3ae1795c..271c4600432d 100644
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -930,8 +930,8 @@ static int vpfe_querycap(struct file *file, void *priv,
930 930
931 v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_querycap\n"); 931 v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_querycap\n");
932 932
933 cap->version = VPFE_CAPTURE_VERSION_CODE; 933 cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
934 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; 934 cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
935 strlcpy(cap->driver, CAPTURE_DRV_NAME, sizeof(cap->driver)); 935 strlcpy(cap->driver, CAPTURE_DRV_NAME, sizeof(cap->driver));
936 strlcpy(cap->bus_info, "VPFE", sizeof(cap->bus_info)); 936 strlcpy(cap->bus_info, "VPFE", sizeof(cap->bus_info));
937 strlcpy(cap->card, vpfe_dev->cfg->card_name, sizeof(cap->card)); 937 strlcpy(cap->card, vpfe_dev->cfg->card_name, sizeof(cap->card));