diff options
author | Lad, Prabhakar <prabhakar.lad@ti.com> | 2012-09-25 10:21:55 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 21:14:40 -0400 |
commit | 626d533f8cb63b6c0cd6b83e1ce7e7656ccaba84 (patch) | |
tree | 573da10996e77310cc7d4eb703ee4cff6d38a5aa /drivers/media | |
parent | b4a711e7bf59e556d5f692e0c65ef12c6dad6cf8 (diff) |
[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: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/platform/davinci/vpif_capture.c | 8 | ||||
-rw-r--r-- | 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 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, | |||
1635 | { | 1635 | { |
1636 | struct vpif_capture_config *config = vpif_dev->platform_data; | 1636 | struct vpif_capture_config *config = vpif_dev->platform_data; |
1637 | 1637 | ||
1638 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; | 1638 | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; |
1639 | strlcpy(cap->driver, "vpif capture", sizeof(cap->driver)); | 1639 | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; |
1640 | strlcpy(cap->bus_info, "VPIF Platform", sizeof(cap->bus_info)); | 1640 | snprintf(cap->driver, sizeof(cap->driver), "%s", dev_name(vpif_dev)); |
1641 | snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s", | ||
1642 | dev_name(vpif_dev)); | ||
1641 | strlcpy(cap->card, config->card_name, sizeof(cap->card)); | 1643 | strlcpy(cap->card, config->card_name, sizeof(cap->card)); |
1642 | 1644 | ||
1643 | return 0; | 1645 | 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, | |||
827 | { | 827 | { |
828 | struct vpif_display_config *config = vpif_dev->platform_data; | 828 | struct vpif_display_config *config = vpif_dev->platform_data; |
829 | 829 | ||
830 | cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; | 830 | cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; |
831 | strlcpy(cap->driver, "vpif display", sizeof(cap->driver)); | 831 | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; |
832 | strlcpy(cap->bus_info, "Platform", sizeof(cap->bus_info)); | 832 | snprintf(cap->driver, sizeof(cap->driver), "%s", dev_name(vpif_dev)); |
833 | snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s", | ||
834 | dev_name(vpif_dev)); | ||
833 | strlcpy(cap->card, config->card_name, sizeof(cap->card)); | 835 | strlcpy(cap->card, config->card_name, sizeof(cap->card)); |
834 | 836 | ||
835 | return 0; | 837 | return 0; |