aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-09-08 15:59:02 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-13 07:07:42 -0400
commit741e1f3b81c22c81f4ef401856cd22cad0bbd554 (patch)
tree6df7a59f579f45b2af95e79bd503058f51f2c4da /drivers/media/video
parent46510b56ca56a25ce973d6a6e8490c1109ff94ef (diff)
V4L/DVB (9157): cx18/ivtv: add 'PCI:' prefix to bus_info.
Suggested by Martin Dauskardt. This is conform what the other drivers do. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx18/cx18-ioctl.c2
-rw-r--r--drivers/media/video/ivtv/ivtv-ioctl.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index 83aa9cb02e00..f0ca50f5fdde 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -346,7 +346,7 @@ static int cx18_querycap(struct file *file, void *fh,
346 346
347 strlcpy(vcap->driver, CX18_DRIVER_NAME, sizeof(vcap->driver)); 347 strlcpy(vcap->driver, CX18_DRIVER_NAME, sizeof(vcap->driver));
348 strlcpy(vcap->card, cx->card_name, sizeof(vcap->card)); 348 strlcpy(vcap->card, cx->card_name, sizeof(vcap->card));
349 strlcpy(vcap->bus_info, pci_name(cx->dev), sizeof(vcap->bus_info)); 349 snprintf(vcap->bus_info, sizeof(vcap->bus_info), "PCI:%s", pci_name(cx->dev));
350 vcap->version = CX18_DRIVER_VERSION; /* version */ 350 vcap->version = CX18_DRIVER_VERSION; /* version */
351 vcap->capabilities = cx->v4l2_cap; /* capabilities */ 351 vcap->capabilities = cx->v4l2_cap; /* capabilities */
352 return 0; 352 return 0;
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index f00854ad64ea..f5b289ef4103 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -750,7 +750,7 @@ static int ivtv_querycap(struct file *file, void *fh, struct v4l2_capability *vc
750 750
751 strlcpy(vcap->driver, IVTV_DRIVER_NAME, sizeof(vcap->driver)); 751 strlcpy(vcap->driver, IVTV_DRIVER_NAME, sizeof(vcap->driver));
752 strlcpy(vcap->card, itv->card_name, sizeof(vcap->card)); 752 strlcpy(vcap->card, itv->card_name, sizeof(vcap->card));
753 strlcpy(vcap->bus_info, pci_name(itv->dev), sizeof(vcap->bus_info)); 753 snprintf(vcap->bus_info, sizeof(vcap->bus_info), "PCI:%s", pci_name(itv->dev));
754 vcap->version = IVTV_DRIVER_VERSION; /* version */ 754 vcap->version = IVTV_DRIVER_VERSION; /* version */
755 vcap->capabilities = itv->v4l2_cap; /* capabilities */ 755 vcap->capabilities = itv->v4l2_cap; /* capabilities */
756 return 0; 756 return 0;