diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-09-14 11:23:12 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-26 14:32:41 +0200 |
| commit | 72c2af6ec1485604c6aa068cca2932d48d8a5f7a (patch) | |
| tree | e648cee8517ce47a2cf3ee09b3a6a11f88c81543 | |
| parent | [media] DocBook: bus_info can no longer be empty (diff) | |
| download | linux-72c2af6ec1485604c6aa068cca2932d48d8a5f7a.tar.xz linux-72c2af6ec1485604c6aa068cca2932d48d8a5f7a.zip | |
[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>
| -rw-r--r-- | drivers/media/platform/mem2mem_testdev.c | 3 | ||||
| -rw-r--r-- | drivers/media/platform/vivi.c | 3 |
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, { strncpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver) - 1); strncpy(cap->card, MEM2MEM_NAME, sizeof(cap->card) - 1); - strlcpy(cap->bus_info, MEM2MEM_NAME, sizeof(cap->bus_info)); + snprintf(cap->bus_info, sizeof(cap->bus_info), + "platform:%s", MEM2MEM_NAME); cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING; cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 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, strcpy(cap->driver, "vivi"); strcpy(cap->card, "vivi"); - strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info)); + snprintf(cap->bus_info, sizeof(cap->bus_info), + "platform:%s", dev->v4l2_dev.name); cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | V4L2_CAP_READWRITE; cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; |