diff options
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r-- | drivers/media/video/vivi.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 7705fc6baf00..48f5a628c065 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
@@ -1148,7 +1148,8 @@ static int vivi_open(struct file *file) | |||
1148 | return -EBUSY; | 1148 | return -EBUSY; |
1149 | } | 1149 | } |
1150 | 1150 | ||
1151 | dprintk(dev, 1, "open /dev/video%d type=%s users=%d\n", dev->vfd->num, | 1151 | dprintk(dev, 1, "open %s type=%s users=%d\n", |
1152 | video_device_node_name(dev->vfd), | ||
1152 | v4l2_type_names[V4L2_BUF_TYPE_VIDEO_CAPTURE], dev->users); | 1153 | v4l2_type_names[V4L2_BUF_TYPE_VIDEO_CAPTURE], dev->users); |
1153 | 1154 | ||
1154 | /* allocate + initialize per filehandle data */ | 1155 | /* allocate + initialize per filehandle data */ |
@@ -1317,8 +1318,8 @@ static int vivi_release(void) | |||
1317 | list_del(list); | 1318 | list_del(list); |
1318 | dev = list_entry(list, struct vivi_dev, vivi_devlist); | 1319 | dev = list_entry(list, struct vivi_dev, vivi_devlist); |
1319 | 1320 | ||
1320 | v4l2_info(&dev->v4l2_dev, "unregistering /dev/video%d\n", | 1321 | v4l2_info(&dev->v4l2_dev, "unregistering %s\n", |
1321 | dev->vfd->num); | 1322 | video_device_node_name(dev->vfd)); |
1322 | video_unregister_device(dev->vfd); | 1323 | video_unregister_device(dev->vfd); |
1323 | v4l2_device_unregister(&dev->v4l2_dev); | 1324 | v4l2_device_unregister(&dev->v4l2_dev); |
1324 | kfree(dev); | 1325 | kfree(dev); |
@@ -1379,8 +1380,8 @@ static int __init vivi_create_instance(int inst) | |||
1379 | video_nr++; | 1380 | video_nr++; |
1380 | 1381 | ||
1381 | dev->vfd = vfd; | 1382 | dev->vfd = vfd; |
1382 | v4l2_info(&dev->v4l2_dev, "V4L2 device registered as /dev/video%d\n", | 1383 | v4l2_info(&dev->v4l2_dev, "V4L2 device registered as %s\n", |
1383 | vfd->num); | 1384 | video_device_node_name(vfd)); |
1384 | return 0; | 1385 | return 0; |
1385 | 1386 | ||
1386 | rel_vdev: | 1387 | rel_vdev: |