From aed46a2db13cbc2e40b77c243ae77e5f8a8aaac0 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 14 Sep 2012 06:23:12 -0300 Subject: [PATCH] --- yaml --- r: 331092 b: refs/heads/master c: 72c2af6ec1485604c6aa068cca2932d48d8a5f7a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/mem2mem_testdev.c | 3 ++- trunk/drivers/media/platform/vivi.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 962f2c157c48..cde75b959e71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd56c8dd50fab57520f0cf80cee5de552c1680ed +refs/heads/master: 72c2af6ec1485604c6aa068cca2932d48d8a5f7a diff --git a/trunk/drivers/media/platform/mem2mem_testdev.c b/trunk/drivers/media/platform/mem2mem_testdev.c index ccbe8750d259..c1229bef153c 100644 --- a/trunk/drivers/media/platform/mem2mem_testdev.c +++ b/trunk/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/trunk/drivers/media/platform/vivi.c b/trunk/drivers/media/platform/vivi.c index fca80193aa6e..c396da12ad89 100644 --- a/trunk/drivers/media/platform/vivi.c +++ b/trunk/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;