Message ID | 0d254e4e0e8976370c6741818a1b7bfae68b8bce.1347619766.git.hans.verkuil@cisco.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 09/14/2012 12:57 PM, Hans Verkuil wrote: > Prefix bus_info with "platform:". > > Signed-off-by: Hans Verkuil<hans.verkuil@cisco.com> Looks good to me, Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > --- > drivers/media/platform/mem2mem_testdev.c | 3 ++- > 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 0b496f3..74de642 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 a6351c4..7f3e6329 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; -- Regards, Sylwester -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/platform/mem2mem_testdev.c b/drivers/media/platform/mem2mem_testdev.c index 0b496f3..74de642 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 a6351c4..7f3e6329 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;
Prefix bus_info with "platform:". Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> --- drivers/media/platform/mem2mem_testdev.c | 3 ++- drivers/media/platform/vivi.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)