aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-14 05:23:12 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-26 08:32:41 -0400
commit72c2af6ec1485604c6aa068cca2932d48d8a5f7a (patch)
treee648cee8517ce47a2cf3ee09b3a6a11f88c81543 /drivers/media/platform
parentcd56c8dd50fab57520f0cf80cee5de552c1680ed (diff)
[media] vivi/mem2mem_testdev: update to latest bus_info specification
Prefix bus_info with "platform:". Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/mem2mem_testdev.c3
-rw-r--r--drivers/media/platform/vivi.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/platform/mem2mem_testdev.c b/drivers/media/platform/mem2mem_testdev.c
index ccbe8750d259..c1229bef153c 100644
--- a/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/mem2mem_testdev.c
@@ -430,7 +430,8 @@ static int vidioc_querycap(struct file *file, void *priv,
430{ 430{
431 strncpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver) - 1); 431 strncpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver) - 1);
432 strncpy(cap->card, MEM2MEM_NAME, sizeof(cap->card) - 1); 432 strncpy(cap->card, MEM2MEM_NAME, sizeof(cap->card) - 1);
433 strlcpy(cap->bus_info, MEM2MEM_NAME, sizeof(cap->bus_info)); 433 snprintf(cap->bus_info, sizeof(cap->bus_info),
434 "platform:%s", MEM2MEM_NAME);
434 cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING; 435 cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
435 cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 436 cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
436 return 0; 437 return 0;
diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
index fca80193aa6e..c396da12ad89 100644
--- a/drivers/media/platform/vivi.c
+++ b/drivers/media/platform/vivi.c
@@ -898,7 +898,8 @@ static int vidioc_querycap(struct file *file, void *priv,
898 898
899 strcpy(cap->driver, "vivi"); 899 strcpy(cap->driver, "vivi");
900 strcpy(cap->card, "vivi"); 900 strcpy(cap->card, "vivi");
901 strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info)); 901 snprintf(cap->bus_info, sizeof(cap->bus_info),
902 "platform:%s", dev->v4l2_dev.name);
902 cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | 903 cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |
903 V4L2_CAP_READWRITE; 904 V4L2_CAP_READWRITE;
904 cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 905 cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;